Skip to content

The open alternative to Salesforce, designed for AI.

feat: add npm and tarball app distribution with upgrade mechanism (#18358)

Félix Malfait0e89c96170e9
diff --git a/packages/twenty-apps/hello-world/package.json b/packages/twenty-apps/hello-world/package.json
index 1e8141e3016..33888defe51 100644
--- a/packages/twenty-apps/hello-world/package.json
+++ b/packages/twenty-apps/hello-world/package.json
@@ -1,6 +1,6 @@
{
- "name": "hello-world",
- "version": "0.1.0",
+ "name": "@twentyhq/hello-world",
+ "version": "0.2.2",
"license": "MIT",
"engines": {
"node": "^24.5.0",
diff --git a/packages/twenty-apps/hello-world/yarn.lock b/packages/twenty-apps/hello-world/yarn.lock
index 67087601951..d84e9c64885 100644
--- a/packages/twenty-apps/hello-world/yarn.lock
+++ b/packages/twenty-apps/hello-world/yarn.lock
@@ -1591,6 +1591,22 @@ __metadata:
languageName: node
linkType: hard
+"@twentyhq/hello-world@workspace:.":
+ version: 0.0.0-use.local
+ resolution: "@twentyhq/hello-world@workspace:."
+ dependencies:
+ "@types/node": "npm:^24.7.2"
+ "@types/react": "npm:^18.2.0"
+ eslint: "npm:^9.32.0"
+ react: "npm:^18.2.0"
+ twenty-sdk: "npm:0.6.3"
+ typescript: "npm:^5.9.3"
+ typescript-eslint: "npm:^8.50.0"
+ vite-tsconfig-paths: "npm:^4.2.1"
+ vitest: "npm:^3.1.1"
+ languageName: unknown
+ linkType: soft
+
"@types/chai@npm:^5.2.2":
version: 5.2.3
resolution: "@types/chai@npm:5.2.3"
@@ -1604,7 +1620,7 @@ __metadata:
"@types/deep-eql@npm:*":
version: 4.0.2
resolution: "@types/deep-eql@npm:4.0.2"
- checksum: 10c0/bf3f811843117900d7084b9d0c852da9a044d12eb40e6de73b552598a6843c21291a8a381b0532644574beecd5e3491c5ff3a0365ab86b15d59862c025384844
+ checksum: 10c0-bf3f811843117900d7084b9d0c852da9a044d12eb40e6de73b552598a6843c21291a8a381b0532644574beecd5e3491c5ff3a0365ab86b15d59862c025384844
languageName: node
linkType: hard
@@ -4676,22 +4692,6 @@ __metadata:
languageName: node
linkType: hard
-"hello-world@workspace:.":
- version: 0.0.0-use.local
- resolution: "hello-world@workspace:."
- dependencies:
- "@types/node": "npm:^24.7.2"
- "@types/react": "npm:^18.2.0"
- eslint: "npm:^9.32.0"
- react: "npm:^18.2.0"
- twenty-sdk: "npm:0.6.3"
- typescript: "npm:^5.9.3"
- typescript-eslint: "npm:^8.50.0"
- vite-tsconfig-paths: "npm:^4.2.1"
- vitest: "npm:^3.1.1"
- languageName: unknown
- linkType: soft
-
"hoist-non-react-statics@npm:^3.3.1":
version: 3.3.2
resolution: "hoist-non-react-statics@npm:3.3.2"
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index aefa4a3c9ec..99663c9de55 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -316,6 +316,12 @@ export type ApiKeyToken = {
token: Scalars['String'];
};
+export enum AppRegistrationSourceType {
+ LOCAL = 'LOCAL',
+ NPM = 'NPM',
+ TARBALL = 'TARBALL'
+}
+
export type AppToken = {
__typename?: 'AppToken';
createdAt: Scalars['DateTime'];
@@ -328,12 +334,14 @@ export type AppToken = {
export type Application = {
__typename?: 'Application';
agents: Array<Agent>;
+ applicationRegistration?: Maybe<ApplicationRegistrationSummary>;
+ applicationRegistrationId?: Maybe<Scalars['UUID']>;
applicationVariables: Array<ApplicationVariable>;
availablePackages: Scalars['JSON'];
canBeUninstalled: Scalars['Boolean'];
defaultLogicFunctionRole?: Maybe<Role>;
defaultRoleId?: Maybe<Scalars['String']>;
- description: Scalars['String'];
+ description?: Maybe<Scalars['String']>;
id: Scalars['UUID'];
logicFunctions: Array<LogicFunction>;
name: Scalars['String'];
@@ -342,7 +350,7 @@ export type Application = {
packageJsonFileId?: Maybe<Scalars['UUID']>;
settingsCustomTabFrontComponentId?: Maybe<Scalars['UUID']>;
universalIdentifier: Scalars['String'];
- version: Scalars['String'];
+ version?: Maybe<Scalars['String']>;
yarnLockChecksum?: Maybe<Scalars['String']>;
yarnLockFileId?: Maybe<Scalars['UUID']>;
};
@@ -353,11 +361,15 @@ export type ApplicationRegistration = {
createdAt: Scalars['DateTime'];
description?: Maybe<Scalars['String']>;
id: Scalars['UUID'];
+ isFeatured: Scalars['Boolean'];
+ latestAvailableVersion?: Maybe<Scalars['String']>;
logoUrl?: Maybe<Scalars['String']>;
name: Scalars['String'];
oAuthClientId: Scalars['String'];
oAuthRedirectUris: Array<Scalars['String']>;
oAuthScopes: Array<Scalars['String']>;
+ sourcePackage?: Maybe<Scalars['String']>;
+ sourceType: AppRegistrationSourceType;
termsUrl?: Maybe<Scalars['String']>;
universalIdentifier: Scalars['String'];
updatedAt: Scalars['DateTime'];
@@ -371,6 +383,13 @@ export type ApplicationRegistrationStats = {
versionDistribution: Array<VersionDistributionEntry>;
};
+export type ApplicationRegistrationSummary = {
+ __typename?: 'ApplicationRegistrationSummary';
+ id: Scalars['UUID'];
+ latestAvailableVersion?: Maybe<Scalars['String']>;
+ sourceType: AppRegistrationSourceType;
+};
+
export type ApplicationRegistrationVariable = {
__typename?: 'ApplicationRegistrationVariable';
createdAt: Scalars['DateTime'];
@@ -1772,6 +1791,7 @@ export type File = {
export enum FileFolder {
AgentChat = 'AgentChat',
+ AppTarball = 'AppTarball',
Attachment = 'Attachment',
BuiltFrontComponent = 'BuiltFrontComponent',
BuiltLogicFunction = 'BuiltLogicFunction',
@@ -2218,6 +2238,7 @@ export type MarketplaceApp = {
objects: Array<MarketplaceAppObject>;
providers: Array<Scalars['String']>;
screenshots: Array<Scalars['String']>;
+ sourcePackage?: Maybe<Scalars['String']>;
termsUrl?: Maybe<Scalars['String']>;
version: Scalars['String'];
websiteUrl?: Maybe<Scalars['String']>;
@@ -2432,6 +2453,7 @@ export type Mutation = {
initiateOTPProvisioningForAuthenticatedUser: InitiateTwoFactorAuthenticationProvisioning;
installApplication: Scalars['Boolean'];
installMarketplaceApp: Scalars['Boolean'];
+ installNpmApp: Scalars['Boolean'];
removeQueryFromEventStream: Scalars['Boolean'];
removeRoleFromAgent: Scalars['Boolean'];
renewApplicationToken: ApplicationTokenPair;
@@ -2490,7 +2512,9 @@ export type Mutation = {
updateWorkspace: Workspace;
updateWorkspaceFeatureFlag: Scalars['Boolean'];
updateWorkspaceMemberRole: WorkspaceMember;
+ upgradeApplication: Scalars['Boolean'];
uploadAIChatFile: FileWithSignedUrl;
+ uploadAppTarball: ApplicationRegistration;
uploadApplicationFile: File;
uploadFilesFieldFile: FileWithSignedUrl;
uploadFilesFieldFileByUniversalIdentifier: FileWithSignedUrl;
@@ -3019,6 +3043,18 @@ export type MutationInstallApplicationArgs = {
};
+export type MutationInstallMarketplaceAppArgs = {
+ universalIdentifier: Scalars['String'];
+ version?: InputMaybe<Scalars['String']>;
+};
+
+
+export type MutationInstallNpmAppArgs = {
+ packageName: Scalars['String'];
+ version?: InputMaybe<Scalars['String']>;
+};
+
+
export type MutationRemoveQueryFromEventStreamArgs = {
input: RemoveQueryFromEventStreamInput;
};
@@ -3324,11 +3360,23 @@ export type MutationUpdateWorkspaceMemberRoleArgs = {
};
+export type MutationUpgradeApplicationArgs = {
+ appRegistrationId: Scalars['String'];
+ targetVersion: Scalars['String'];
+};
+
+
export type MutationUploadAiChatFileArgs = {
file: Scalars['Upload'];
};
+export type MutationUploadAppTarballArgs = {
+ file: Scalars['Upload'];
+ universalIdentifier?: InputMaybe<Scalars['String']>;
+};
+
+
export type MutationUploadApplicationFileArgs = {
applicationUniversalIdentifier: Scalars['String'];
file: Scalars['Upload'];
@@ -5765,19 +5813,19 @@ export type UpdateOneApplicationVariableMutationVariables = Exact<{
export type UpdateOneApplicationVariableMutation = { __typename?: 'Mutation', updateOneApplicationVariable: boolean };
-export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };
+export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };
export type FindManyApplicationsQueryVariables = Exact<{ [key: string]: never; }>;
-export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description: string, version: string }> };
+export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, applicationRegistrationId?: string | null, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null }> };
export type FindOneApplicationQueryVariables = Exact<{
id: Scalars['UUID'];
}>;
-export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description: string, version: string, universalIdentifier: string, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };
+export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };
export type AuthTokenFragmentFragment = { __typename?: 'AuthToken', token: string, expiresAt: string };
@@ -6172,12 +6220,44 @@ export type GetLogicFunctionSourceCodeQueryVariables = Exact<{
export type GetLogicFunctionSourceCodeQuery = { __typename?: 'Query', getLogicFunctionSourceCode?: string | null };
-export type MarketplaceAppFieldsFragment = { __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null };
+export type MarketplaceAppFieldsFragment = { __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null };
+
+export type InstallMarketplaceAppMutationVariables = Exact<{
+ universalIdentifier: Scalars['String'];
+ version?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type InstallMarketplaceAppMutation = { __typename?: 'Mutation', installMarketplaceApp: boolean };
+
+export type InstallNpmAppMutationVariables = Exact<{
+ packageName: Scalars['String'];
+ version?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type InstallNpmAppMutation = { __typename?: 'Mutation', installNpmApp: boolean };
+
+export type UpgradeApplicationMutationVariables = Exact<{
+ appRegistrationId: Scalars['String'];
+ targetVersion: Scalars['String'];
+}>;
+
+
+export type UpgradeApplicationMutation = { __typename?: 'Mutation', upgradeApplication: boolean };
+
+export type UploadAppTarballMutationVariables = Exact<{
+ file: Scalars['Upload'];
+ universalIdentifier?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type UploadAppTarballMutation = { __typename?: 'Mutation', uploadAppTarball: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string } };
export type FindManyMarketplaceAppsQueryVariables = Exact<{ [key: string]: never; }>;
-export type FindManyMarketplaceAppsQuery = { __typename?: 'Query', findManyMarketplaceApps: Array<{ __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null }> };
+export type FindManyMarketplaceAppsQuery = { __typename?: 'Query', findManyMarketplaceApps: Array<{ __typename?: 'MarketplaceApp', id: string, name: string, description: string, icon: string, version: string, author: string, category: string, logo?: string | null, screenshots: Array<string>, aboutDescription: string, providers: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, sourcePackage?: string | null, objects: Array<{ __typename?: 'MarketplaceAppObject', universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, fields: Array<{ __typename?: 'MarketplaceAppField', universalIdentifier?: string | null, name: string, type: string, label: string, description?: string | null, icon?: string | null }> }>, fields: Array<{ __typename?: 'MarketplaceAppField', name: string, type: string, label: string, description?: string | null, icon?: string | null, objectUniversalIdentifier?: string | null }>, logicFunctions: Array<{ __typename?: 'MarketplaceAppLogicFunction', name: string, description?: string | null, timeoutSeconds?: number | null }>, frontComponents: Array<{ __typename?: 'MarketplaceAppFrontComponent', name: string, description?: string | null }>, defaultRole?: { __typename?: 'MarketplaceAppDefaultRole', id: string, label: string, description?: string | null, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canUpdateAllSettings: boolean, canAccessAllTools: boolean, permissionFlags: Array<string>, objectPermissions: Array<{ __typename?: 'MarketplaceAppRoleObjectPermission', objectUniversalIdentifier: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null }>, fieldPermissions: Array<{ __typename?: 'MarketplaceAppRoleFieldPermission', objectUniversalIdentifier: string, fieldUniversalIdentifier: string, canReadFieldValue?: boolean | null, canUpdateFieldValue?: boolean | null }> } | null }> };
export type NavigationMenuItemFieldsFragment = { __typename?: 'NavigationMenuItem', id: string, userWorkspaceId?: string | null, targetRecordId?: string | null, targetObjectMetadataId?: string | null, viewId?: string | null, folderId?: string | null, name?: string | null, link?: string | null, icon?: string | null, color?: string | null, position: number, applicationId?: string | null, createdAt: string, updatedAt: string };
@@ -6464,7 +6544,7 @@ export type GetSystemHealthStatusQueryVariables = Exact<{ [key: string]: never;
export type GetSystemHealthStatusQuery = { __typename?: 'Query', getSystemHealthStatus: { __typename?: 'SystemHealth', services: Array<{ __typename?: 'SystemHealthService', id: HealthIndicatorId, label: string, status: AdminPanelHealthServiceStatus }> } };
-export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string };
+export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string };
export type DeleteApplicationRegistrationMutationVariables = Exact<{
id: Scalars['String'];
@@ -6485,7 +6565,7 @@ export type UpdateApplicationRegistrationMutationVariables = Exact<{
}>;
-export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
+export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
export type UpdateApplicationRegistrationVariableMutationVariables = Exact<{
input: UpdateApplicationRegistrationVariableInput;
@@ -6518,14 +6598,14 @@ export type FindApplicationRegistrationVariablesQuery = { __typename?: 'Query',
export type FindManyApplicationRegistrationsQueryVariables = Exact<{ [key: string]: never; }>;
-export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string }> };
+export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string }> };
export type FindOneApplicationRegistrationQueryVariables = Exact<{
id: Scalars['String'];
}>;
-export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
+export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
export type UninstallApplicationMutationVariables = Exact<{
universalIdentifier: Scalars['String'];
@@ -7422,6 +7502,12 @@ export const ApplicationFieldsFragmentDoc = gql`
description
version
universalIdentifier
+ applicationRegistrationId
+ applicationRegistration {
+ id
+ latestAvailableVersion
+ sourceType
+ }
canBeUninstalled
defaultRoleId
settingsCustomTabFrontComponentId
@@ -7790,6 +7876,7 @@ export const MarketplaceAppFieldsFragmentDoc = gql`
name
description
}
+ sourcePackage
defaultRole {
id
label
@@ -7856,6 +7943,9 @@ export const ApplicationRegistrationFragmentFragmentDoc = gql`
oAuthClientId
oAuthRedirectUris
oAuthScopes
+ sourceType
+ sourcePackage
+ latestAvailableVersion
websiteUrl
termsUrl
createdAt
@@ -9283,6 +9373,12 @@ export const FindManyApplicationsDocument = gql`
name
description
version
+ applicationRegistrationId
+ applicationRegistration {
+ id
+ latestAvailableVersion
+ sourceType
+ }
}
}
`;
@@ -11329,6 +11425,144 @@ export function useGetLogicFunctionSourceCodeLazyQuery(baseOptions?: Apollo.Lazy
export type GetLogicFunctionSourceCodeQueryHookResult = ReturnType<typeof useGetLogicFunctionSourceCodeQuery>;
export type GetLogicFunctionSourceCodeLazyQueryHookResult = ReturnType<typeof useGetLogicFunctionSourceCodeLazyQuery>;
export type GetLogicFunctionSourceCodeQueryResult = Apollo.QueryResult<GetLogicFunctionSourceCodeQuery, GetLogicFunctionSourceCodeQueryVariables>;
+export const InstallMarketplaceAppDocument = gql`
+ mutation InstallMarketplaceApp($universalIdentifier: String!, $version: String) {
+ installMarketplaceApp(
+ universalIdentifier: $universalIdentifier
+ version: $version
+ )
+}
+ `;
+export type InstallMarketplaceAppMutationFn = Apollo.MutationFunction<InstallMarketplaceAppMutation, InstallMarketplaceAppMutationVariables>;
+
+/**
+ * __useInstallMarketplaceAppMutation__
+ *
+ * To run a mutation, you first call `useInstallMarketplaceAppMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useInstallMarketplaceAppMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [installMarketplaceAppMutation, { data, loading, error }] = useInstallMarketplaceAppMutation({
+ * variables: {
+ * universalIdentifier: // value for 'universalIdentifier'
+ * version: // value for 'version'
+ * },
+ * });
+ */
+export function useInstallMarketplaceAppMutation(baseOptions?: Apollo.MutationHookOptions<InstallMarketplaceAppMutation, InstallMarketplaceAppMutationVariables>) {
+ const options = {...defaultOptions, ...baseOptions}
+ return Apollo.useMutation<InstallMarketplaceAppMutation, InstallMarketplaceAppMutationVariables>(InstallMarketplaceAppDocument, options);
+ }
+export type InstallMarketplaceAppMutationHookResult = ReturnType<typeof useInstallMarketplaceAppMutation>;
+export type InstallMarketplaceAppMutationResult = Apollo.MutationResult<InstallMarketplaceAppMutation>;
+export type InstallMarketplaceAppMutationOptions = Apollo.BaseMutationOptions<InstallMarketplaceAppMutation, InstallMarketplaceAppMutationVariables>;
+export const InstallNpmAppDocument = gql`
+ mutation InstallNpmApp($packageName: String!, $version: String) {
+ installNpmApp(packageName: $packageName, version: $version)
+}
+ `;
+export type InstallNpmAppMutationFn = Apollo.MutationFunction<InstallNpmAppMutation, InstallNpmAppMutationVariables>;
+
+/**
+ * __useInstallNpmAppMutation__
+ *
+ * To run a mutation, you first call `useInstallNpmAppMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useInstallNpmAppMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [installNpmAppMutation, { data, loading, error }] = useInstallNpmAppMutation({
+ * variables: {
+ * packageName: // value for 'packageName'
+ * version: // value for 'version'
+ * },
+ * });
+ */
+export function useInstallNpmAppMutation(baseOptions?: Apollo.MutationHookOptions<InstallNpmAppMutation, InstallNpmAppMutationVariables>) {
+ const options = {...defaultOptions, ...baseOptions}
+ return Apollo.useMutation<InstallNpmAppMutation, InstallNpmAppMutationVariables>(InstallNpmAppDocument, options);
+ }
+export type InstallNpmAppMutationHookResult = ReturnType<typeof useInstallNpmAppMutation>;
+export type InstallNpmAppMutationResult = Apollo.MutationResult<InstallNpmAppMutation>;
+export type InstallNpmAppMutationOptions = Apollo.BaseMutationOptions<InstallNpmAppMutation, InstallNpmAppMutationVariables>;
+export const UpgradeApplicationDocument = gql`
+ mutation UpgradeApplication($appRegistrationId: String!, $targetVersion: String!) {
+ upgradeApplication(
+ appRegistrationId: $appRegistrationId
+ targetVersion: $targetVersion
+ )
+}
+ `;
+export type UpgradeApplicationMutationFn = Apollo.MutationFunction<UpgradeApplicationMutation, UpgradeApplicationMutationVariables>;
+
+/**
+ * __useUpgradeApplicationMutation__
+ *
+ * To run a mutation, you first call `useUpgradeApplicationMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpgradeApplicationMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [upgradeApplicationMutation, { data, loading, error }] = useUpgradeApplicationMutation({
+ * variables: {
+ * appRegistrationId: // value for 'appRegistrationId'
+ * targetVersion: // value for 'targetVersion'
+ * },
+ * });
+ */
+export function useUpgradeApplicationMutation(baseOptions?: Apollo.MutationHookOptions<UpgradeApplicationMutation, UpgradeApplicationMutationVariables>) {
+ const options = {...defaultOptions, ...baseOptions}
+ return Apollo.useMutation<UpgradeApplicationMutation, UpgradeApplicationMutationVariables>(UpgradeApplicationDocument, options);
+ }
+export type UpgradeApplicationMutationHookResult = ReturnType<typeof useUpgradeApplicationMutation>;
+export type UpgradeApplicationMutationResult = Apollo.MutationResult<UpgradeApplicationMutation>;
+export type UpgradeApplicationMutationOptions = Apollo.BaseMutationOptions<UpgradeApplicationMutation, UpgradeApplicationMutationVariables>;
+export const UploadAppTarballDocument = gql`
+ mutation UploadAppTarball($file: Upload!, $universalIdentifier: String) {
+ uploadAppTarball(file: $file, universalIdentifier: $universalIdentifier) {
+ id
+ universalIdentifier
+ name
+ }
+}
+ `;
+export type UploadAppTarballMutationFn = Apollo.MutationFunction<UploadAppTarballMutation, UploadAppTarballMutationVariables>;
+
+/**
+ * __useUploadAppTarballMutation__
+ *
+ * To run a mutation, you first call `useUploadAppTarballMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUploadAppTarballMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [uploadAppTarballMutation, { data, loading, error }] = useUploadAppTarballMutation({
+ * variables: {
+ * file: // value for 'file'
+ * universalIdentifier: // value for 'universalIdentifier'
+ * },
+ * });
+ */
+export function useUploadAppTarballMutation(baseOptions?: Apollo.MutationHookOptions<UploadAppTarballMutation, UploadAppTarballMutationVariables>) {
+ const options = {...defaultOptions, ...baseOptions}
+ return Apollo.useMutation<UploadAppTarballMutation, UploadAppTarballMutationVariables>(UploadAppTarballDocument, options);
+ }
+export type UploadAppTarballMutationHookResult = ReturnType<typeof useUploadAppTarballMutation>;
+export type UploadAppTarballMutationResult = Apollo.MutationResult<UploadAppTarballMutation>;
+export type UploadAppTarballMutationOptions = Apollo.BaseMutationOptions<UploadAppTarballMutation, UploadAppTarballMutationVariables>;
export const FindManyMarketplaceAppsDocument = gql`
query FindManyMarketplaceApps {
findManyMarketplaceApps {
diff --git a/packages/twenty-front/src/modules/applications/graphql/fragments/applicationFragment.ts b/packages/twenty-front/src/modules/applications/graphql/fragments/applicationFragment.ts
index 882e253fb4b..126e174c6ec 100644
--- a/packages/twenty-front/src/modules/applications/graphql/fragments/applicationFragment.ts
+++ b/packages/twenty-front/src/modules/applications/graphql/fragments/applicationFragment.ts
@@ -13,6 +13,12 @@ export const APPLICATION_FRAGMENT = gql`
description
version
universalIdentifier
+ applicationRegistrationId
+ applicationRegistration {
+ id
+ latestAvailableVersion
+ sourceType
+ }
canBeUninstalled
defaultRoleId
settingsCustomTabFrontComponentId
diff --git a/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts b/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts
index ceb1ba708fd..5144c9c928b 100644
--- a/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts
+++ b/packages/twenty-front/src/modules/applications/graphql/queries/findManyApplications.ts
@@ -7,6 +7,12 @@ export const FIND_MANY_APPLICATIONS = gql`
name
description
version
+ applicationRegistrationId
+ applicationRegistration {
+ id
+ latestAvailableVersion
+ sourceType
+ }
}
}
`;
diff --git a/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts b/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts
index d4e6f625389..6ebbe4afdb1 100644
--- a/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts
+++ b/packages/twenty-front/src/modules/marketplace/graphql/fragments/marketplaceAppFragment.ts
@@ -49,6 +49,7 @@ export const MARKETPLACE_APP_FRAGMENT = gql`
name
description
}
+ sourcePackage
defaultRole {
id
label
diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installMarketplaceApp.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installMarketplaceApp.ts
index 223be5ab51d..aba1aaf25bc 100644
--- a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installMarketplaceApp.ts
+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installMarketplaceApp.ts
@@ -1,7 +1,13 @@
import gql from 'graphql-tag';
export const INSTALL_MARKETPLACE_APP = gql`
- mutation InstallMarketplaceApp() {
- installMarketplaceApp()
+ mutation InstallMarketplaceApp(
+ $universalIdentifier: String!
+ $version: String
+ ) {
+ installMarketplaceApp(
+ universalIdentifier: $universalIdentifier
+ version: $version
+ )
}
`;
diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.ts
new file mode 100644
index 00000000000..575a7dea763
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/installNpmApp.ts
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag';
+
+export const INSTALL_NPM_APP = gql`
+ mutation InstallNpmApp($packageName: String!, $version: String) {
+ installNpmApp(packageName: $packageName, version: $version)
+ }
+`;
diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/upgradeApplication.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/upgradeApplication.ts
new file mode 100644
index 00000000000..fd2eb6d883b
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/upgradeApplication.ts
@@ -0,0 +1,13 @@
+import gql from 'graphql-tag';
+
+export const UPGRADE_APPLICATION = gql`
+ mutation UpgradeApplication(
+ $appRegistrationId: String!
+ $targetVersion: String!
+ ) {
+ upgradeApplication(
+ appRegistrationId: $appRegistrationId
+ targetVersion: $targetVersion
+ )
+ }
+`;
diff --git a/packages/twenty-front/src/modules/marketplace/graphql/mutations/uploadAppTarball.ts b/packages/twenty-front/src/modules/marketplace/graphql/mutations/uploadAppTarball.ts
new file mode 100644
index 00000000000..05d3911683a
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/graphql/mutations/uploadAppTarball.ts
@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client';
+
+export const UPLOAD_APP_TARBALL = gql`
+ mutation UploadAppTarball($file: Upload!, $universalIdentifier: String) {
+ uploadAppTarball(file: $file, universalIdentifier: $universalIdentifier) {
+ id
+ universalIdentifier
+ name
+ }
+ }
+`;
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts
new file mode 100644
index 00000000000..31570c632fd
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useInstallApp.ts
@@ -0,0 +1,41 @@
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { t } from '@lingui/core/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+export const useInstallApp = <TVariables extends Record<string, unknown>>(
+ mutationFn: (options: {
+ variables: TVariables;
+ }) => Promise<{ data?: Record<string, unknown> | null }>,
+) => {
+ const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();
+ const [isInstalling, setIsInstalling] = useState(false);
+
+ const install = async (variables: TVariables) => {
+ setIsInstalling(true);
+
+ try {
+ const result = await mutationFn({ variables });
+
+ if (isDefined(result.data)) {
+ enqueueSuccessSnackBar({
+ message: t`Application installed successfully.`,
+ });
+
+ return true;
+ }
+
+ return false;
+ } catch {
+ enqueueErrorSnackBar({
+ message: t`Failed to install the application.`,
+ });
+
+ return false;
+ } finally {
+ setIsInstalling(false);
+ }
+ };
+
+ return { install, isInstalling };
+};
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
index c629422f20a..a69c63c05b3 100644
--- a/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
@@ -1,9 +1,11 @@
+import { useInstallApp } from '~/modules/marketplace/hooks/useInstallApp';
+import { useInstallMarketplaceAppMutation } from '~/generated-metadata/graphql';
+
export const useInstallMarketplaceApp = () => {
- const install = async () => {
- return true;
- };
+ const [installMarketplaceAppMutation] = useInstallMarketplaceAppMutation();
- return {
- install,
- };
+ return useInstallApp<{
+ universalIdentifier: string;
+ version?: string;
+ }>(installMarketplaceAppMutation);
};
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.ts
new file mode 100644
index 00000000000..9168b8a596f
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useInstallNpmApp.ts
@@ -0,0 +1,13 @@
+import { useMutation } from '@apollo/client';
+
+import { useInstallApp } from '~/modules/marketplace/hooks/useInstallApp';
+import { INSTALL_NPM_APP } from '~/modules/marketplace/graphql/mutations/installNpmApp';
+
+export const useInstallNpmApp = () => {
+ const [installNpmAppMutation] = useMutation(INSTALL_NPM_APP);
+
+ return useInstallApp<{
+ packageName: string;
+ version?: string;
+ }>(installNpmAppMutation);
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/useMarketplaceApps.ts b/packages/twenty-front/src/modules/marketplace/hooks/useMarketplaceApps.ts
similarity index 100%
rename from packages/twenty-front/src/pages/settings/applications/hooks/useMarketplaceApps.ts
rename to packages/twenty-front/src/modules/marketplace/hooks/useMarketplaceApps.ts
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts
new file mode 100644
index 00000000000..af1ff1e9027
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts
@@ -0,0 +1,44 @@
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { t } from '@lingui/core/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { useUpgradeApplicationMutation } from '~/generated-metadata/graphql';
+
+export const useUpgradeApplication = () => {
+ const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();
+ const [upgradeApplicationMutation] = useUpgradeApplicationMutation();
+ const [isUpgrading, setIsUpgrading] = useState(false);
+
+ const upgrade = async (params: {
+ appRegistrationId: string;
+ targetVersion: string;
+ }) => {
+ setIsUpgrading(true);
+
+ try {
+ const result = await upgradeApplicationMutation({
+ variables: params,
+ });
+
+ if (isDefined(result.data)) {
+ enqueueSuccessSnackBar({
+ message: t`Application upgraded successfully.`,
+ });
+
+ return true;
+ }
+
+ return false;
+ } catch {
+ enqueueErrorSnackBar({
+ message: t`Failed to upgrade the application.`,
+ });
+
+ return false;
+ } finally {
+ setIsUpgrading(false);
+ }
+ };
+
+ return { upgrade, isUpgrading };
+};
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts b/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts
new file mode 100644
index 00000000000..dc96f5713d5
--- /dev/null
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useUploadAppTarball.ts
@@ -0,0 +1,54 @@
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useMutation } from '@apollo/client';
+import { t } from '@lingui/core/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { UPLOAD_APP_TARBALL } from '~/modules/marketplace/graphql/mutations/uploadAppTarball';
+
+type UploadResult =
+ | {
+ success: true;
+ universalIdentifier: string;
+ }
+ | {
+ success: false;
+ };
+
+export const useUploadAppTarball = () => {
+ const [uploadAppTarball] = useMutation(UPLOAD_APP_TARBALL);
+ const { enqueueErrorSnackBar } = useSnackBar();
+ const [isUploading, setIsUploading] = useState(false);
+
+ const upload = async (file: File): Promise<UploadResult> => {
+ setIsUploading(true);
+
+ try {
+ const result = await uploadAppTarball({
+ variables: { file },
+ });
+
+ const registration = result.data?.uploadAppTarball;
+
+ if (!isDefined(registration?.universalIdentifier)) {
+ enqueueErrorSnackBar({ message: t`Upload failed.` });
+
+ return { success: false };
+ }
+
+ return {
+ success: true,
+ universalIdentifier: registration.universalIdentifier,
+ };
+ } catch {
+ enqueueErrorSnackBar({
+ message: t`Failed to upload tarball.`,
+ });
+
+ return { success: false };
+ } finally {
+ setIsUploading(false);
+ }
+ };
+
+ return { upload, isUploading };
+};
diff --git a/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts b/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts
index e9756655e61..f129e72cecb 100644
--- a/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts
+++ b/packages/twenty-front/src/modules/settings/application-registrations/graphql/fragments/applicationRegistrationFragment.ts
@@ -11,6 +11,9 @@ export const APPLICATION_REGISTRATION_FRAGMENT = gql`
oAuthClientId
oAuthRedirectUris
oAuthScopes
+ sourceType
+ sourcePackage
+ latestAvailableVersion
websiteUrl
termsUrl
createdAt
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
index 038c0d9f89a..96fb23b0d16 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
@@ -28,7 +28,7 @@ import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { PermissionFlagType } from '~/generated-metadata/graphql';
-import { useMarketplaceApps } from '~/pages/settings/applications/hooks/useMarketplaceApps';
+import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';
import { SettingsApplicationPermissionsTab } from '~/pages/settings/applications/tabs/SettingsApplicationPermissionsTab';
import { SettingsAvailableApplicationDetailContentTab } from '~/pages/settings/applications/tabs/SettingsAvailableApplicationDetailContentTab';
@@ -248,7 +248,7 @@ export const SettingsAvailableApplicationDetails = () => {
const [selectedScreenshotIndex, setSelectedScreenshotIndex] = useState(0);
const { data: marketplaceApps } = useMarketplaceApps();
- const { install } = useInstallMarketplaceApp();
+ const { install, isInstalling } = useInstallMarketplaceApp();
const canInstallMarketplaceApps = useHasPermissionFlag(
PermissionFlagType.MARKETPLACE_APPS,
);
@@ -259,7 +259,9 @@ export const SettingsAvailableApplicationDetails = () => {
const handleInstall = async () => {
if (isDefined(application)) {
- await install();
+ await install({
+ universalIdentifier: application.id,
+ });
}
};
@@ -460,10 +462,11 @@ export const SettingsAvailableApplicationDetails = () => {
{canInstallMarketplaceApps && (
<Button
Icon={IconDownload}
- title={t`Install`}
+ title={isInstalling ? t`Installing...` : t`Install`}
variant="primary"
accent="blue"
onClick={handleInstall}
+ disabled={isInstalling}
/>
)}
</StyledHeader>
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
new file mode 100644
index 00000000000..ada60e5c87e
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
@@ -0,0 +1,94 @@
+import { styled } from '@linaria/react';
+
+import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStatefulWrapper';
+import { Button } from 'twenty-ui/input';
+import {
+ type ModalOverlay,
+ type ModalPadding,
+ type ModalSize,
+ Section,
+} from 'twenty-ui/layout';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+type StyledAppModalBaseProps = React.PropsWithChildren<{
+ modalId: string;
+ size?: ModalSize;
+ padding?: ModalPadding;
+ overlay?: ModalOverlay;
+ dataGloballyPreventClickOutside?: boolean;
+}>;
+
+type StyledAppModalProps = StyledAppModalBaseProps &
+ (
+ | { isClosable: true; onClose?: () => void }
+ | { isClosable?: false; onClose?: never }
+ );
+
+const ModalWrapper = ({
+ modalId,
+ children,
+ size,
+ padding,
+ overlay,
+ dataGloballyPreventClickOutside,
+ isClosable,
+ onClose,
+}: StyledAppModalBaseProps & { isClosable: boolean; onClose?: () => void }) =>
+ isClosable ? (
+ <ModalStatefulWrapper
+ modalInstanceId={modalId}
+ isClosable={true}
+ onClose={onClose}
+ size={size}
+ padding={padding}
+ overlay={overlay}
+ smallBorderRadius
+ narrowWidth
+ autoHeight
+ dataGloballyPreventClickOutside={dataGloballyPreventClickOutside}
+ >
+ {children}
+ </ModalStatefulWrapper>
+ ) : (
+ <ModalStatefulWrapper
+ modalInstanceId={modalId}
+ isClosable={false}
+ size={size}
+ padding={padding}
+ overlay={overlay}
+ smallBorderRadius
+ narrowWidth
+ autoHeight
+ dataGloballyPreventClickOutside={dataGloballyPreventClickOutside}
+ >
+ {children}
+ </ModalStatefulWrapper>
+ );
+
+export const StyledAppModal = (props: StyledAppModalProps) => (
+ <ModalWrapper
+ modalId={props.modalId}
+ size={props.size}
+ padding={props.padding}
+ overlay={props.overlay}
+ dataGloballyPreventClickOutside={props.dataGloballyPreventClickOutside}
+ isClosable={props.isClosable ?? false}
+ onClose={props.isClosable ? props.onClose : undefined}
+ >
+ {props.children}
+ </ModalWrapper>
+);
+
+export const StyledAppModalButton = styled(Button)`
+ box-sizing: border-box;
+ justify-content: center;
+ margin-top: ${themeCssVariables.spacing[2]};
+`;
+
+export const StyledAppModalTitle = styled.div`
+ text-align: center;
+`;
+
+export const StyledAppModalSection = styled(Section)`
+ margin-bottom: ${themeCssVariables.spacing[6]};
+`;
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
index 9cc37c8b98f..129de468337 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
@@ -1,15 +1,18 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
+import { t } from '@lingui/core/macro';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
export type SettingsApplicationTableRowProps = {
action: ReactNode;
application: ApplicationWithoutRelation;
+ hasUpdate?: boolean;
link?: string;
};
@@ -29,9 +32,17 @@ const StyledActionTableCell = styled(TableCell)`
padding-right: ${themeCssVariables.spacing[2]};
`;
+const StyledDescriptionCell = styled(TableCell)`
+ display: flex;
+ align-items: center;
+ gap: ${themeCssVariables.spacing[2]};
+ min-width: 0;
+`;
+
export const SettingsApplicationTableRow = ({
action,
application,
+ hasUpdate,
link,
}: SettingsApplicationTableRowProps) => {
return (
@@ -39,9 +50,12 @@ export const SettingsApplicationTableRow = ({
<StyledNameTableCell>
<OverflowingTextWithTooltip text={application.name} />
</StyledNameTableCell>
- <TableCell>
+ <StyledDescriptionCell>
<OverflowingTextWithTooltip text={application.description} />
- </TableCell>
+ {hasUpdate === true && (
+ <Tag color="blue" text={t`Update`} weight="medium" />
+ )}
+ </StyledDescriptionCell>
<StyledActionTableCell>{action}</StyledActionTableCell>
</StyledApplicationTableRow>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
index e4f581b4cd0..f811bf36ad6 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
@@ -1,24 +1,55 @@
import { SettingsAdminTableCard } from '@/settings/admin-panel/components/SettingsAdminTableCard';
import { SettingsAdminVersionDisplay } from '@/settings/admin-panel/components/SettingsAdminVersionDisplay';
+import { useUpgradeApplication } from '@/marketplace/hooks/useUpgradeApplication';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconCircleDot, IconStatusChange } from 'twenty-ui/display';
-import type { Application } from '~/generated-metadata/graphql';
+import { IconCircleDot, IconStatusChange, IconUpload } from 'twenty-ui/display';
+import { Button } from 'twenty-ui/input';
+import {
+ AppRegistrationSourceType,
+ type Application,
+} from '~/generated-metadata/graphql';
+import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
export const SettingsApplicationVersionContainer = ({
application,
+ latestAvailableVersion,
+ appRegistrationId,
}: {
application?: Omit<Application, 'objects' | 'universalIdentifier'> & {
objects: { id: string }[];
};
+ latestAvailableVersion?: string | null;
+ appRegistrationId?: string | null;
}) => {
const loading = !isDefined(application);
-
const currentVersion = application?.version;
- // TODO fetch latestVersion of the application
- // if published on twenty public application registry
- const latestVersion = currentVersion;
+ const sourceType = application?.applicationRegistration?.sourceType;
+ const isNpmApp = sourceType === AppRegistrationSourceType.NPM;
+
+ const latestVersion = isNpmApp
+ ? (latestAvailableVersion ?? currentVersion)
+ : currentVersion;
+
+ const hasUpdate =
+ isNpmApp &&
+ isDefined(latestAvailableVersion) &&
+ isDefined(currentVersion) &&
+ isNewerSemver(latestAvailableVersion, currentVersion);
+
+ const { upgrade, isUpgrading } = useUpgradeApplication();
+
+ const handleUpgrade = async () => {
+ if (!isDefined(appRegistrationId) || !isDefined(latestAvailableVersion)) {
+ return;
+ }
+
+ await upgrade({
+ appRegistrationId,
+ targetVersion: latestAvailableVersion,
+ });
+ };
const versionItems = [
{
@@ -32,24 +63,44 @@ export const SettingsApplicationVersionContainer = ({
/>
),
},
- {
- Icon: IconStatusChange,
- label: t`Latest version`,
- value: (
- <SettingsAdminVersionDisplay
- version={latestVersion}
- loading={loading}
- noVersionMessage={t`No latest version found`}
- />
- ),
- },
+ ...(isNpmApp
+ ? [
+ {
+ Icon: IconStatusChange,
+ label: t`Latest version`,
+ value: (
+ <SettingsAdminVersionDisplay
+ version={latestVersion}
+ loading={loading}
+ noVersionMessage={t`No latest version found`}
+ />
+ ),
+ },
+ ]
+ : []),
];
return (
- <SettingsAdminTableCard
- rounded
- items={versionItems}
- gridAutoColumns="3fr 8fr"
- />
+ <>
+ <SettingsAdminTableCard
+ rounded
+ items={versionItems}
+ gridAutoColumns="3fr 8fr"
+ />
+ {hasUpdate && isDefined(appRegistrationId) && (
+ <Button
+ Icon={IconUpload}
+ title={
+ isUpgrading
+ ? t`Upgrading...`
+ : t`Upgrade to ${latestAvailableVersion}`
+ }
+ variant="secondary"
+ accent="blue"
+ onClick={handleUpgrade}
+ disabled={isUpgrading}
+ />
+ )}
+ </>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index 850f5c5d079..cf334f4edca 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -1,6 +1,6 @@
import { H2Title, IconChevronRight, IconSearch } from 'twenty-ui/display';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
-import { getSettingsPath } from 'twenty-shared/utils';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { SettingsPath } from 'twenty-shared/types';
import { useLingui } from '@lingui/react/macro';
import { Table } from '@/ui/layout/table/components/Table';
@@ -11,10 +11,12 @@ import {
} from '~/pages/settings/applications/components/SettingsApplicationTableRow';
import { useContext, useMemo, useState } from 'react';
import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
+import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
import { Section } from 'twenty-ui/layout';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { ThemeContext } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { AppRegistrationSourceType } from '~/generated-metadata/graphql';
const StyledTable = styled(Table)`
margin-top: ${themeCssVariables.spacing[3]};
@@ -44,7 +46,7 @@ export const SettingsApplicationsTable = ({
return applications.filter(
(application) =>
application.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
- application.description
+ (application.description ?? '')
.toLowerCase()
.includes(searchTerm.toLowerCase()),
);
@@ -70,21 +72,37 @@ export const SettingsApplicationsTable = ({
<TableHeader> {''}</TableHeader>
<TableHeader />
</StyledTableHeaderRow>
- {filteredApplications.map((application) => (
- <SettingsApplicationTableRow
- key={application.id}
- application={application}
- action={
- <IconChevronRight
- size={theme.icon.size.md}
- stroke={theme.icon.stroke.sm}
- />
- }
- link={getSettingsPath(SettingsPath.ApplicationDetail, {
- applicationId: application.id,
- })}
- />
- ))}
+ {filteredApplications.map((application) => {
+ const isNpmApp =
+ application.applicationRegistration?.sourceType ===
+ AppRegistrationSourceType.NPM;
+
+ const latestVersion =
+ application.applicationRegistration?.latestAvailableVersion;
+
+ const hasUpdate =
+ isNpmApp &&
+ isDefined(latestVersion) &&
+ isDefined(application.version) &&
+ isNewerSemver(latestVersion, application.version);
+
+ return (
+ <SettingsApplicationTableRow
+ key={application.id}
+ application={application}
+ hasUpdate={hasUpdate}
+ action={
+ <IconChevronRight
+ size={theme.icon.size.md}
+ stroke={theme.icon.stroke.sm}
+ />
+ }
+ link={getSettingsPath(SettingsPath.ApplicationDetail, {
+ applicationId: application.id,
+ })}
+ />
+ );
+ })}
</StyledTable>
</Section>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsx
new file mode 100644
index 00000000000..db1cbc31996
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsInstallNpmAppModal.tsx
@@ -0,0 +1,122 @@
+import { styled } from '@linaria/react';
+import { useState } from 'react';
+
+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { useLingui } from '@lingui/react/macro';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/display';
+import { Section, SectionAlignment, SectionFontColor } from 'twenty-ui/layout';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { useInstallNpmApp } from '~/modules/marketplace/hooks/useInstallNpmApp';
+import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';
+import {
+ StyledAppModal,
+ StyledAppModalButton,
+ StyledAppModalSection,
+ StyledAppModalTitle,
+} from '~/pages/settings/applications/components/SettingsAppModalLayout';
+
+export const INSTALL_NPM_APP_MODAL_ID = 'install-npm-app-modal';
+
+const StyledInputGroup = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[3]};
+`;
+
+export const SettingsInstallNpmAppModal = () => {
+ const { t } = useLingui();
+ const { closeModal } = useModal();
+ const { install, isInstalling } = useInstallNpmApp();
+ const { refetch } = useFindManyApplicationsQuery();
+
+ const [packageName, setPackageName] = useState('');
+ const [version, setVersion] = useState('');
+
+ const isValid = packageName.trim().length > 0;
+
+ const handleInstall = async () => {
+ if (!isValid) {
+ return;
+ }
+
+ const success = await install({
+ packageName: packageName.trim(),
+ version: version.trim() || undefined,
+ });
+
+ if (success) {
+ await refetch();
+ closeModal(INSTALL_NPM_APP_MODAL_ID);
+ setPackageName('');
+ setVersion('');
+ }
+ };
+
+ const handleCancel = () => {
+ closeModal(INSTALL_NPM_APP_MODAL_ID);
+ setPackageName('');
+ setVersion('');
+ };
+
+ return (
+ <StyledAppModal
+ modalId={INSTALL_NPM_APP_MODAL_ID}
+ isClosable={true}
+ padding="large"
+ dataGloballyPreventClickOutside
+ >
+ <StyledAppModalTitle>
+ <H1Title
+ title={t`Install from npm`}
+ fontColor={H1TitleFontColor.Primary}
+ />
+ </StyledAppModalTitle>
+ <StyledAppModalSection
+ alignment={SectionAlignment.Center}
+ fontColor={SectionFontColor.Primary}
+ >
+ {t`Enter the npm package name of the application you want to install.`}
+ </StyledAppModalSection>
+
+ <Section>
+ <StyledInputGroup>
+ <SettingsTextInput
+ instanceId="npm-package-name-input"
+ value={packageName}
+ onChange={setPackageName}
+ placeholder={t`e.g. @twentyhq/hello-world`}
+ fullWidth
+ disableHotkeys
+ label={t`Package name`}
+ autoFocusOnMount
+ />
+ <SettingsTextInput
+ instanceId="npm-version-input"
+ value={version}
+ onChange={setVersion}
+ placeholder={t`latest`}
+ fullWidth
+ disableHotkeys
+ label={t`Version (optional)`}
+ />
+ </StyledInputGroup>
+ </Section>
+
+ <StyledAppModalButton
+ onClick={handleCancel}
+ variant="secondary"
+ title={t`Cancel`}
+ fullWidth
+ />
+ <StyledAppModalButton
+ onClick={handleInstall}
+ variant="secondary"
+ accent="blue"
+ title={t`Install`}
+ disabled={!isValid || isInstalling}
+ fullWidth
+ />
+ </StyledAppModal>
+ );
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx
new file mode 100644
index 00000000000..03461c003d5
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsUploadTarballModal.tsx
@@ -0,0 +1,113 @@
+import { styled } from '@linaria/react';
+import { useRef } from 'react';
+
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { useLingui } from '@lingui/react/macro';
+import { isDefined } from 'twenty-shared/utils';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/display';
+import { SectionAlignment, SectionFontColor } from 'twenty-ui/layout';
+import { useUploadAppTarball } from '~/modules/marketplace/hooks/useUploadAppTarball';
+import { useInstallMarketplaceApp } from '~/modules/marketplace/hooks/useInstallMarketplaceApp';
+import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';
+import {
+ StyledAppModal,
+ StyledAppModalButton,
+ StyledAppModalSection,
+ StyledAppModalTitle,
+} from '~/pages/settings/applications/components/SettingsAppModalLayout';
+
+export const UPLOAD_TARBALL_MODAL_ID = 'upload-tarball-modal';
+
+const StyledFileInput = styled.input`
+ display: none;
+`;
+
+export const SettingsUploadTarballModal = () => {
+ const { t } = useLingui();
+ const { closeModal } = useModal();
+ const { upload, isUploading } = useUploadAppTarball();
+ const { install } = useInstallMarketplaceApp();
+ const { refetch } = useFindManyApplicationsQuery();
+ const fileInputRef = useRef<HTMLInputElement>(null);
+
+ const handleSelectFile = () => {
+ fileInputRef.current?.click();
+ };
+
+ const handleFileChange = async (
+ event: React.ChangeEvent<HTMLInputElement>,
+ ) => {
+ const file = event.target.files?.[0];
+
+ if (!isDefined(file)) {
+ return;
+ }
+
+ try {
+ const uploadResult = await upload(file);
+
+ if (uploadResult.success) {
+ const installResult = await install({
+ universalIdentifier: uploadResult.universalIdentifier,
+ });
+
+ if (installResult) {
+ await refetch();
+ closeModal(UPLOAD_TARBALL_MODAL_ID);
+ }
+ }
+ } finally {
+ if (isDefined(fileInputRef.current)) {
+ fileInputRef.current.value = '';
+ }
+ }
+ };
+
+ const handleCancel = () => {
+ closeModal(UPLOAD_TARBALL_MODAL_ID);
+ };
+
+ return (
+ <StyledAppModal
+ modalId={UPLOAD_TARBALL_MODAL_ID}
+ isClosable={true}
+ padding="large"
+ dataGloballyPreventClickOutside
+ >
+ <StyledAppModalTitle>
+ <H1Title
+ title={t`Upload tarball`}
+ fontColor={H1TitleFontColor.Primary}
+ />
+ </StyledAppModalTitle>
+ <StyledAppModalSection
+ alignment={SectionAlignment.Center}
+ fontColor={SectionFontColor.Primary}
+ >
+ {t`Select a .tar.gz application package to upload and install.`}
+ </StyledAppModalSection>
+
+ <StyledFileInput
+ ref={fileInputRef}
+ type="file"
+ accept=".tar.gz,.tgz"
+ onChange={handleFileChange}
+ />
+
+ <StyledAppModalButton
+ onClick={handleCancel}
+ variant="secondary"
+ title={t`Cancel`}
+ fullWidth
+ />
+ <StyledAppModalButton
+ onClick={handleSelectFile}
+ variant="secondary"
+ accent="blue"
+ title={t`Choose file`}
+ disabled={isUploading}
+ fullWidth
+ />
+ </StyledAppModal>
+ );
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
index 914e0d67de9..9491881b8ce 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
@@ -36,6 +36,11 @@ export const SettingsApplicationDetailAboutTab = ({
const navigate = useNavigateSettings();
+ const registrationId = application?.applicationRegistrationId;
+
+ const latestAvailableVersion =
+ application?.applicationRegistration?.latestAvailableVersion ?? null;
+
if (!isDefined(application)) {
return null;
}
@@ -80,7 +85,7 @@ export const SettingsApplicationDetailAboutTab = ({
/>
<SettingsTextInput
instanceId={`application-description-${id}`}
- value={description}
+ value={description ?? undefined}
disabled
fullWidth
/>
@@ -90,7 +95,11 @@ export const SettingsApplicationDetailAboutTab = ({
title={t`Version`}
description={t`Version of the application`}
/>
- <SettingsApplicationVersionContainer application={application} />
+ <SettingsApplicationVersionContainer
+ application={application}
+ latestAvailableVersion={latestAvailableVersion}
+ appRegistrationId={registrationId}
+ />
</Section>
{application.canBeUninstalled && (
<>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
index 7b79a7c68b2..fa0d5feff5e 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
@@ -5,7 +5,7 @@ import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsAvailableApplicationCard } from '~/pages/settings/applications/components/SettingsAvailableApplicationCard';
-import { useMarketplaceApps } from '~/pages/settings/applications/hooks/useMarketplaceApps';
+import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';
const StyledSearchInputContainer = styled.div`
padding-bottom: ${themeCssVariables.spacing[2]};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx
index 69ff9ce9b88..74240a67ecb 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsInstalledTab.tsx
@@ -1,14 +1,99 @@
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { IconChevronDown, IconDownload, IconUpload } from 'twenty-ui/display';
+import { Button, ButtonGroup, IconButton } from 'twenty-ui/input';
+import { Section } from 'twenty-ui/layout';
+import { MenuItem } from 'twenty-ui/navigation';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useFindManyApplicationsQuery } from '~/generated-metadata/graphql';
import { SettingsApplicationsTable } from '~/pages/settings/applications/components/SettingsApplicationsTable';
+import {
+ INSTALL_NPM_APP_MODAL_ID,
+ SettingsInstallNpmAppModal,
+} from '~/pages/settings/applications/components/SettingsInstallNpmAppModal';
+import {
+ SettingsUploadTarballModal,
+ UPLOAD_TARBALL_MODAL_ID,
+} from '~/pages/settings/applications/components/SettingsUploadTarballModal';
+
+const INSTALL_APP_DROPDOWN_ID = 'install-app-dropdown';
+
+const StyledButtonGroupContainer = styled.div`
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: ${themeCssVariables.spacing[4]};
+`;
export const SettingsApplicationsInstalledTab = () => {
+ const { t } = useLingui();
const { data } = useFindManyApplicationsQuery();
+ const { openModal } = useModal();
+ const { closeDropdown } = useCloseDropdown();
const applications = data?.findManyApplications ?? [];
- if (applications.length === 0) {
- return null;
- }
+ const handleInstallFromNpm = () => {
+ closeDropdown(INSTALL_APP_DROPDOWN_ID);
+ openModal(INSTALL_NPM_APP_MODAL_ID);
+ };
+
+ const handleUploadTarball = () => {
+ closeDropdown(INSTALL_APP_DROPDOWN_ID);
+ openModal(UPLOAD_TARBALL_MODAL_ID);
+ };
+
+ return (
+ <>
+ {applications.length > 0 && (
+ <SettingsApplicationsTable applications={applications} />
+ )}
+
+ <Section>
+ <StyledButtonGroupContainer>
+ <ButtonGroup size="small" variant="secondary">
+ <Button
+ Icon={IconDownload}
+ title={t`Install app`}
+ onClick={handleInstallFromNpm}
+ />
+ <Dropdown
+ dropdownId={INSTALL_APP_DROPDOWN_ID}
+ clickableComponent={
+ <IconButton
+ size="small"
+ variant="secondary"
+ Icon={IconChevronDown}
+ position="right"
+ />
+ }
+ dropdownComponents={
+ <DropdownContent>
+ <DropdownMenuItemsContainer>
+ <MenuItem
+ LeftIcon={IconDownload}
+ text={t`Install from npm`}
+ onClick={handleInstallFromNpm}
+ />
+ <MenuItem
+ LeftIcon={IconUpload}
+ text={t`Upload tarball`}
+ onClick={handleUploadTarball}
+ />
+ </DropdownMenuItemsContainer>
+ </DropdownContent>
+ }
+ />
+ </ButtonGroup>
+ </StyledButtonGroupContainer>
+ </Section>
- return <SettingsApplicationsTable applications={applications} />;
+ <SettingsInstallNpmAppModal />
+ <SettingsUploadTarballModal />
+ </>
+ );
};
diff --git a/packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts b/packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts
index a2615cf6995..4864de1fc68 100644
--- a/packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts
+++ b/packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts
@@ -2,5 +2,10 @@ import { type Application } from '~/generated-metadata/graphql';
export type ApplicationWithoutRelation = Pick<
Application,
- 'id' | 'name' | 'description'
+ | 'id'
+ | 'name'
+ | 'description'
+ | 'version'
+ | 'applicationRegistrationId'
+ | 'applicationRegistration'
>;
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/isNewerSemver.ts b/packages/twenty-front/src/pages/settings/applications/utils/isNewerSemver.ts
new file mode 100644
index 00000000000..a0677dcc0ba
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/utils/isNewerSemver.ts
@@ -0,0 +1,15 @@
+// Returns true if versionA is strictly greater than versionB (major.minor.patch)
+export const isNewerSemver = (versionA: string, versionB: string): boolean => {
+ const partsA = versionA.split('.').map(Number);
+ const partsB = versionB.split('.').map(Number);
+
+ for (let i = 0; i < 3; i++) {
+ const a = partsA[i] ?? 0;
+ const b = partsB[i] ?? 0;
+
+ if (a > b) return true;
+ if (a < b) return false;
+ }
+
+ return false;
+};
diff --git a/packages/twenty-sdk/package.json b/packages/twenty-sdk/package.json
index 07747f84b6b..daee8c6b101 100644
--- a/packages/twenty-sdk/package.json
+++ b/packages/twenty-sdk/package.json
@@ -79,6 +79,7 @@
"dotenv": "^16.4.0",
"esbuild": "^0.25.0",
"fast-glob": "^3.3.0",
+ "form-data": "^4.0.5",
"fs-extra": "^11.2.0",
"graphql": "^16.8.1",
"graphql-sse": "^2.5.4",
diff --git a/packages/twenty-sdk/src/cli/commands/app-command.ts b/packages/twenty-sdk/src/cli/commands/app-command.ts
index 877dd6c4b24..e4f3053abbe 100644
--- a/packages/twenty-sdk/src/cli/commands/app-command.ts
+++ b/packages/twenty-sdk/src/cli/commands/app-command.ts
@@ -3,6 +3,8 @@ import chalk from 'chalk';
import type { Command } from 'commander';
import { AppBuildCommand } from './app/app-build';
import { AppDevCommand } from './app/app-dev';
+import { AppPackCommand } from './app/app-pack';
+import { AppPushCommand } from './app/app-push';
import { AppTypecheckCommand } from './app/app-typecheck';
import { AppUninstallCommand } from './app/app-uninstall';
import { AuthListCommand } from './auth/auth-list';
@@ -63,6 +65,8 @@ export const registerCommands = (program: Command): void => {
// App commands
const buildCommand = new AppBuildCommand();
const devCommand = new AppDevCommand();
+ const packCommand = new AppPackCommand();
+ const pushCommand = new AppPushCommand();
const typecheckCommand = new AppTypecheckCommand();
const uninstallCommand = new AppUninstallCommand();
const addCommand = new EntityAddCommand();
@@ -112,6 +116,28 @@ export const registerCommands = (program: Command): void => {
}
});
+ program
+ .command('app:pack [appPath]')
+ .description('Build and pack the application into a .tgz tarball')
+ .action(async (appPath) => {
+ await packCommand.execute({ appPath: formatPath(appPath) });
+ });
+
+ program
+ .command('app:push [appPath]')
+ .description(
+ 'Build, upload, and install a local application on a Twenty server (for air-gapped/dev deployments)',
+ )
+ .option('--server <url>', 'Twenty server URL')
+ .option('--token <token>', 'Auth token for the server')
+ .action(async (appPath, options) => {
+ await pushCommand.execute({
+ appPath: formatPath(appPath),
+ server: options.server,
+ token: options.token,
+ });
+ });
+
program
.command('entity:add [entityType]')
.option('--path <path>', 'Path in which the entity should be created.')
diff --git a/packages/twenty-sdk/src/cli/commands/app/app-pack.ts b/packages/twenty-sdk/src/cli/commands/app/app-pack.ts
new file mode 100644
index 00000000000..3a2722dc103
--- /dev/null
+++ b/packages/twenty-sdk/src/cli/commands/app/app-pack.ts
@@ -0,0 +1,30 @@
+import { appPack } from '@/cli/public-operations/app-pack';
+import { CURRENT_EXECUTION_DIRECTORY } from '@/cli/utilities/config/current-execution-directory';
+import chalk from 'chalk';
+
+export type AppPackCommandOptions = {
+ appPath?: string;
+};
+
+export class AppPackCommand {
+ async execute(options: AppPackCommandOptions): Promise<void> {
+ const appPath = options.appPath ?? CURRENT_EXECUTION_DIRECTORY;
+
+ console.log(chalk.blue('Building and packing application...'));
+ console.log(chalk.gray(`App path: ${appPath}`));
+ console.log('');
+
+ const result = await appPack({
+ appPath,
+ onProgress: (message) => console.log(chalk.gray(message)),
+ });
+
+ if (!result.success) {
+ console.error(chalk.red(result.error.message));
+ process.exit(1);
+ }
+
+ console.log(chalk.green('✓ Application packed successfully'));
+ console.log(chalk.gray(`Tarball: ${result.data.tarballPath}`));
+ }
+}
diff --git a/packages/twenty-sdk/src/cli/commands/app/app-push.ts b/packages/twenty-sdk/src/cli/commands/app/app-push.ts
new file mode 100644
index 00000000000..425b14a1970
--- /dev/null
+++ b/packages/twenty-sdk/src/cli/commands/app/app-push.ts
@@ -0,0 +1,62 @@
+import { appPack } from '@/cli/public-operations/app-pack';
+import { CURRENT_EXECUTION_DIRECTORY } from '@/cli/utilities/config/current-execution-directory';
+import { ApiService } from '@/cli/utilities/api/api-service';
+import chalk from 'chalk';
+import fs from 'fs';
+
+export type AppPushCommandOptions = {
+ appPath?: string;
+ server?: string;
+ token?: string;
+};
+
+export class AppPushCommand {
+ async execute(options: AppPushCommandOptions): Promise<void> {
+ const appPath = options.appPath ?? CURRENT_EXECUTION_DIRECTORY;
+
+ console.log(chalk.blue('Building, packing, and pushing application...'));
+ console.log(chalk.gray(`App path: ${appPath}`));
+ console.log('');
+
+ const packResult = await appPack({
+ appPath,
+ onProgress: (message) => console.log(chalk.gray(message)),
+ });
+
+ if (!packResult.success) {
+ console.error(chalk.red(packResult.error.message));
+ process.exit(1);
+ }
+
+ const { tarballPath } = packResult.data;
+
+ console.log(chalk.gray(`Uploading ${tarballPath}...`));
+
+ const tarballBuffer = fs.readFileSync(tarballPath);
+
+ const apiService = new ApiService({
+ serverUrl: options.server,
+ token: options.token,
+ });
+
+ const uploadResult = await apiService.uploadAppTarball({ tarballBuffer });
+
+ if (!uploadResult.success) {
+ console.error(chalk.red(`Upload failed: ${uploadResult.error}`));
+ process.exit(1);
+ }
+
+ console.log(chalk.gray('Installing application...'));
+
+ const installResult = await apiService.installTarballApp({
+ universalIdentifier: uploadResult.data.universalIdentifier,
+ });
+
+ if (!installResult.success) {
+ console.error(chalk.red(`Install failed: ${installResult.error}`));
+ process.exit(1);
+ }
+
+ console.log(chalk.green('✓ Application pushed and installed successfully'));
+ }
+}
diff --git a/packages/twenty-sdk/src/cli/public-operations/app-pack.ts b/packages/twenty-sdk/src/cli/public-operations/app-pack.ts
new file mode 100644
index 00000000000..93c9d07ffc2
--- /dev/null
+++ b/packages/twenty-sdk/src/cli/public-operations/app-pack.ts
@@ -0,0 +1,39 @@
+import { execSync } from 'child_process';
+import path from 'path';
+
+import { appBuild, type AppBuildOptions } from './app-build';
+import { runSafe } from '@/cli/utilities/run-safe';
+import { APP_ERROR_CODES, type CommandResult } from './types';
+
+export type AppPackResult = {
+ tarballPath: string;
+};
+
+const innerAppPack = async (
+ options: AppBuildOptions,
+): Promise<CommandResult<AppPackResult>> => {
+ const buildResult = await appBuild(options);
+
+ if (!buildResult.success) {
+ return buildResult;
+ }
+
+ options.onProgress?.('Packing tarball...');
+
+ const outputDir = path.join(options.appPath, '.twenty', 'output');
+
+ const packOutput = execSync('npm pack --pack-destination .', {
+ cwd: outputDir,
+ encoding: 'utf-8',
+ }).trim();
+
+ const tarballName = packOutput.split('\n').pop()!;
+ const tarballPath = path.join(outputDir, tarballName);
+
+ return { success: true, data: { tarballPath } };
+};
+
+export const appPack = (
+ options: AppBuildOptions,
+): Promise<CommandResult<AppPackResult>> =>
+ runSafe(() => innerAppPack(options), APP_ERROR_CODES.SYNC_FAILED);
diff --git a/packages/twenty-sdk/src/cli/public-operations/index.ts b/packages/twenty-sdk/src/cli/public-operations/index.ts
index 4182316ab81..32cd23cdf8e 100644
--- a/packages/twenty-sdk/src/cli/public-operations/index.ts
+++ b/packages/twenty-sdk/src/cli/public-operations/index.ts
@@ -7,6 +7,8 @@ export type { AuthLogoutOptions } from './auth-logout';
// App
export { appBuild } from './app-build';
export type { AppBuildOptions, AppBuildResult } from './app-build';
+export { appPack } from './app-pack';
+export type { AppPackResult } from './app-pack';
export { appUninstall } from './app-uninstall';
export type { AppUninstallOptions } from './app-uninstall';
diff --git a/packages/twenty-sdk/src/cli/utilities/api/api-service.ts b/packages/twenty-sdk/src/cli/utilities/api/api-service.ts
index 9e71ba2db82..2bfc0a79b7d 100644
--- a/packages/twenty-sdk/src/cli/utilities/api/api-service.ts
+++ b/packages/twenty-sdk/src/cli/utilities/api/api-service.ts
@@ -14,18 +14,24 @@ export class ApiService {
private client: AxiosInstance;
private configService: ConfigService;
- constructor(options?: { disableInterceptors: boolean }) {
- const { disableInterceptors = false } = options || {};
+ constructor(options?: {
+ disableInterceptors?: boolean;
+ serverUrl?: string;
+ token?: string;
+ }) {
+ const { disableInterceptors = false, serverUrl, token } = options || {};
this.configService = new ConfigService();
this.client = axios.create();
this.client.interceptors.request.use(async (config) => {
const twentyConfig = await this.configService.getConfig();
- config.baseURL = twentyConfig.apiUrl;
+ config.baseURL = serverUrl ?? twentyConfig.apiUrl;
+
+ const authToken = token ?? twentyConfig.apiKey;
- if (!config.headers.Authorization && twentyConfig.apiKey) {
- config.headers.Authorization = `Bearer ${twentyConfig.apiKey}`;
+ if (!config.headers.Authorization && authToken) {
+ config.headers.Authorization = `Bearer ${authToken}`;
}
return config;
@@ -794,6 +800,140 @@ export class ApiService {
);
}
+ // TODO: Migrate to MetadataClient once available
+ // (see https://github.com/twentyhq/core-team-issues/issues/2289)
+ async uploadAppTarball({
+ tarballBuffer,
+ universalIdentifier,
+ }: {
+ tarballBuffer: Buffer;
+ universalIdentifier?: string;
+ }): Promise<
+ ApiResponse<{
+ id: string;
+ universalIdentifier: string;
+ name: string;
+ }>
+ > {
+ try {
+ const mutation = `
+ mutation UploadAppTarball($file: Upload!, $universalIdentifier: String) {
+ uploadAppTarball(file: $file, universalIdentifier: $universalIdentifier) {
+ id
+ universalIdentifier
+ name
+ }
+ }
+ `;
+
+ const operations = JSON.stringify({
+ query: mutation,
+ variables: {
+ file: null,
+ universalIdentifier: universalIdentifier ?? null,
+ },
+ });
+
+ const map = JSON.stringify({
+ '0': ['variables.file'],
+ });
+
+ const formData = new FormData();
+
+ formData.append('operations', operations);
+ formData.append('map', map);
+ formData.append(
+ '0',
+ new Blob([new Uint8Array(tarballBuffer)], {
+ type: 'application/gzip',
+ }),
+ 'app.tar.gz',
+ );
+
+ const response: AxiosResponse = await this.client.post(
+ '/metadata',
+ formData,
+ );
+
+ if (response.data.errors) {
+ return {
+ success: false,
+ error: response.data.errors[0]?.message || 'Failed to upload tarball',
+ };
+ }
+
+ return {
+ success: true,
+ data: response.data.data.uploadAppTarball,
+ };
+ } catch (error) {
+ if (axios.isAxiosError(error) && error.response) {
+ return {
+ success: false,
+ error: error.response.data?.errors?.[0]?.message || error.message,
+ };
+ }
+
+ return {
+ success: false,
+ error,
+ };
+ }
+ }
+
+ async installTarballApp({
+ universalIdentifier,
+ }: {
+ universalIdentifier: string;
+ }): Promise<ApiResponse<boolean>> {
+ try {
+ const mutation = `
+ mutation InstallMarketplaceApp($universalIdentifier: String!) {
+ installMarketplaceApp(universalIdentifier: $universalIdentifier)
+ }
+ `;
+
+ const response: AxiosResponse = await this.client.post(
+ '/metadata',
+ {
+ query: mutation,
+ variables: { universalIdentifier },
+ },
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: '*/*',
+ },
+ },
+ );
+
+ if (response.data.errors) {
+ return {
+ success: false,
+ error:
+ response.data.errors[0]?.message || 'Failed to install application',
+ };
+ }
+
+ return {
+ success: true,
+ data: response.data.data.installMarketplaceApp,
+ };
+ } catch (error) {
+ if (axios.isAxiosError(error) && error.response) {
+ return {
+ success: false,
+ error: error.response.data?.errors?.[0]?.message || error.message,
+ };
+ }
+
+ return {
+ success: false,
+ error,
+ };
+ }
+ }
+
async uploadFile({
filePath,
builtHandlerPath,
diff --git a/packages/twenty-sdk/vite.config.node.ts b/packages/twenty-sdk/vite.config.node.ts
index 8578abb7f0f..c84e95d72e1 100644
--- a/packages/twenty-sdk/vite.config.node.ts
+++ b/packages/twenty-sdk/vite.config.node.ts
@@ -37,15 +37,16 @@ export default defineConfig(() => {
}
const builtins = [
- 'path',
+ 'child_process',
+ 'crypto',
'fs',
'fs/promises',
- 'url',
- 'crypto',
+ 'module',
+ 'os',
+ 'path',
'stream',
+ 'url',
'util',
- 'os',
- 'module',
];
if (builtins.includes(id)) {
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index f9e913a03f6..c5c50280fe5 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -172,6 +172,7 @@
"semver": "7.6.3",
"sharp": "0.32.6",
"stripe": "19.3.1",
+ "tar": "^7.5.9",
"temporal-polyfill": "^0.3.0",
"transliteration": "2.3.5",
"tsconfig-paths": "^4.2.0",
@@ -221,6 +222,7 @@
"@types/pluralize": "^0.0.33",
"@types/psl": "^1.1.3",
"@types/react": "^18.2.39",
+ "@types/tar": "^7.0.87",
"@types/unzipper": "^0",
"@yarnpkg/types": "^4.0.0",
"rimraf": "^5.0.5",
diff --git a/packages/twenty-server/src/database/commands/cron-register-all.command.ts b/packages/twenty-server/src/database/commands/cron-register-all.command.ts
index ea6f508b6de..8fdac4a99d0 100644
--- a/packages/twenty-server/src/database/commands/cron-register-all.command.ts
+++ b/packages/twenty-server/src/database/commands/cron-register-all.command.ts
@@ -2,6 +2,8 @@ import { Logger } from '@nestjs/common';
import { Command, CommandRunner } from 'nest-commander';
+import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';
+import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';
import { EventLogCleanupCronCommand } from 'src/engine/core-modules/event-logs/cleanup/commands/event-log-cleanup.cron.command';
import { CheckPublicDomainsValidRecordsCronCommand } from 'src/engine/core-modules/public-domain/crons/commands/check-public-domains-valid-records.cron.command';
import { CheckCustomDomainValidRecordsCronCommand } from 'src/engine/core-modules/workspace/crons/commands/check-custom-domain-valid-records.cron.command';
@@ -52,6 +54,8 @@ export class CronRegisterAllCommand extends CommandRunner {
private readonly cleanOnboardingWorkspacesCronCommand: CleanOnboardingWorkspacesCronCommand,
private readonly trashCleanupCronCommand: TrashCleanupCronCommand,
private readonly eventLogCleanupCronCommand: EventLogCleanupCronCommand,
+ private readonly marketplaceCatalogSyncCronCommand: MarketplaceCatalogSyncCronCommand,
+ private readonly appVersionCheckCronCommand: AppVersionCheckCronCommand,
) {
super();
}
@@ -136,6 +140,14 @@ export class CronRegisterAllCommand extends CommandRunner {
name: 'EventLogCleanup',
command: this.eventLogCleanupCronCommand,
},
+ {
+ name: 'MarketplaceCatalogSync',
+ command: this.marketplaceCatalogSyncCronCommand,
+ },
+ {
+ name: 'AppVersionCheck',
+ command: this.appVersionCheckCronCommand,
+ },
];
let successCount = 0;
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index e8d6221ce56..3bb4591c02b 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -9,6 +9,8 @@ import { UpgradeVersionCommandModule } from 'src/database/commands/upgrade-versi
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
import { GenerateApiKeyCommand } from 'src/engine/core-modules/api-key/commands/generate-api-key.command';
+import { AppVersionCheckModule } from 'src/engine/core-modules/application/application-version-check/application-version-check.module';
+import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';
import { EventLogCleanupModule } from 'src/engine/core-modules/event-logs/cleanup/event-log-cleanup.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { FileModule } from 'src/engine/core-modules/file/file.module';
@@ -55,6 +57,8 @@ import { AutomatedTriggerModule } from 'src/modules/workflow/workflow-trigger/au
TrashCleanupModule,
PublicDomainModule,
EventLogCleanupModule,
+ MarketplaceModule,
+ AppVersionCheckModule,
],
providers: [
DataSeedWorkspaceCommand,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts
index 83fa7cc883b..beab570c1a2 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-backfill-application-package-files.command.ts
@@ -8,7 +8,7 @@ import { DataSource, Repository } from 'typeorm';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command.ts
index 6f5a6f52932..686d47a4174 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-17/1-17-identify-webhook-metadata.command.ts
@@ -6,7 +6,7 @@ import { v4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-backfill-message-channel-throttle-retry-after.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-backfill-message-channel-throttle-retry-after.command.ts
index b1b888b124c..8c6553ddc16 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-backfill-message-channel-throttle-retry-after.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-backfill-message-channel-throttle-retry-after.command.ts
@@ -7,7 +7,7 @@ import { Repository } from 'typeorm';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command.ts
index f7682805aa8..96f179dc4bb 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-activity-rich-text-attachment-file-ids.command.ts
@@ -13,7 +13,7 @@ import { v4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command.ts
index 471fec43a08..c1f27609f75 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-attachment-files.command.ts
@@ -14,7 +14,7 @@ import { v4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts
index de2cbaaa085..8c13e0ab187 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-favorites-to-navigation-menu-items.command.ts
@@ -10,7 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command.ts
index c4c7cb803fd..5109b5af1fa 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-person-avatar-files.command.ts
@@ -15,7 +15,7 @@ import { v4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workflow-send-email-attachments.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workflow-send-email-attachments.command.ts
index bc1e352b5de..9431e394a56 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workflow-send-email-attachments.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workflow-send-email-attachments.command.ts
@@ -9,7 +9,7 @@ import { DataSource, In, Repository } from 'typeorm';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workspace-pictures.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workspace-pictures.command.ts
index 1e80f10be82..cafc79ba69f 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workspace-pictures.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-18/1-18-migrate-workspace-pictures.command.ts
@@ -14,7 +14,7 @@ import { v4 } from 'uuid';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command.ts
index 1781dba9ba6..a0423767118 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command.ts
@@ -7,7 +7,7 @@ import { Repository } from 'typeorm';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command.ts
index fb55be1fae3..b57def03e9c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command.ts
@@ -7,7 +7,7 @@ import { Repository } from 'typeorm';
import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1772267875870-addAppRegistrationSourceFields.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1772267875870-addAppRegistrationSourceFields.ts
new file mode 100644
index 00000000000..319ab0baf72
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1772267875870-addAppRegistrationSourceFields.ts
@@ -0,0 +1,70 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddAppRegistrationSourceFields1772267875870
+ implements MigrationInterface
+{
+ name = 'AddAppRegistrationSourceFields1772267875870';
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "sourceType" text NOT NULL DEFAULT 'local'`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "sourcePackage" text`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "tarballFileId" uuid`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "latestAvailableVersion" text`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "REL_36715821de396df9536fd4afc8" UNIQUE ("tarballFileId")`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD CONSTRAINT "FK_36715821de396df9536fd4afc81" FOREIGN KEY ("tarballFileId") REFERENCES "core"."file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "isFeatured" boolean NOT NULL DEFAULT false`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" ADD "marketplaceDisplayData" jsonb`,
+ );
+
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration"
+ ADD CONSTRAINT "CHK_NPM_HAS_SOURCE_PACKAGE"
+ CHECK ("sourceType" <> 'npm' OR "sourcePackage" IS NOT NULL)`,
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT IF EXISTS "CHK_NPM_HAS_SOURCE_PACKAGE"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "marketplaceDisplayData"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "isFeatured"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT "FK_36715821de396df9536fd4afc81"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP CONSTRAINT "REL_36715821de396df9536fd4afc8"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "latestAvailableVersion"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "tarballFileId"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "sourcePackage"`,
+ );
+ await queryRunner.query(
+ `ALTER TABLE "core"."applicationRegistration" DROP COLUMN "sourceType"`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts
new file mode 100644
index 00000000000..eea6d62a307
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts
@@ -0,0 +1,28 @@
+import { Module } from '@nestjs/common';
+
+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { ApplicationDevelopmentResolver } from 'src/engine/core-modules/application/application-development/application-development.resolver';
+import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+
+@Module({
+ imports: [
+ ApplicationInstallModule,
+ ApplicationRegistrationModule,
+ ApplicationModule,
+ FeatureFlagModule,
+ TokenModule,
+ FileStorageModule,
+ PermissionsModule,
+ ],
+ providers: [
+ ApplicationDevelopmentResolver,
+ WorkspaceMigrationGraphqlApiExceptionInterceptor,
+ ],
+})
+export class ApplicationDevelopmentModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
similarity index 59%
rename from packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
index 941618d3231..adf28602b77 100644
--- a/packages/twenty-server/src/engine/core-modules/application/resolvers/application-development.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
@@ -1,4 +1,5 @@
import {
+ Logger,
UseFilters,
UseGuards,
UseInterceptors,
@@ -12,6 +13,9 @@ import { FileFolder, FeatureFlagKey } from 'twenty-shared/types';
import type { FileUpload } from 'graphql-upload/processRequest.mjs';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
import {
@@ -24,8 +28,8 @@ import { CreateApplicationInput } from 'src/engine/core-modules/application/dtos
import { GenerateApplicationTokenInput } from 'src/engine/core-modules/application/dtos/generate-application-token.input';
import { UploadApplicationFileInput } from 'src/engine/core-modules/application/dtos/uploadApplicationFileInput';
import { WorkspaceMigrationDTO } from 'src/engine/core-modules/application/dtos/workspace-migration.dto';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/services/application-sync.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';
import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
@@ -34,7 +38,10 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { DevelopmentGuard } from 'src/engine/guards/development.guard';
-import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
+import {
+ FeatureFlagGuard,
+ RequireFeatureFlag,
+} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@@ -46,14 +53,19 @@ import { streamToBuffer } from 'src/utils/stream-to-buffer';
@UseFilters(ApplicationExceptionFilter)
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
DevelopmentGuard,
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
export class ApplicationDevelopmentResolver {
+ private readonly logger = new Logger(ApplicationDevelopmentResolver.name);
+
constructor(
private readonly applicationTokenService: ApplicationTokenService,
private readonly applicationSyncService: ApplicationSyncService,
private readonly applicationService: ApplicationService,
+ private readonly applicationRegistrationService: ApplicationRegistrationService,
+ private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,
private readonly fileStorageService: FileStorageService,
) {}
@@ -75,12 +87,33 @@ export class ApplicationDevelopmentResolver {
@Args() { manifest }: ApplicationInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<WorkspaceMigrationDTO> {
+ const applicationRegistrationId =
+ await this.resolveApplicationRegistrationId(
+ manifest.application.universalIdentifier,
+ {
+ name: manifest.application.displayName,
+ description: manifest.application.description,
+ logoUrl: manifest.application.logoUrl,
+ author: manifest.application.author,
+ websiteUrl: manifest.application.websiteUrl,
+ termsUrl: manifest.application.termsUrl,
+ },
+ workspaceId,
+ );
+
const workspaceMigration =
await this.applicationSyncService.synchronizeFromManifest({
workspaceId,
manifest,
+ applicationRegistrationId,
});
+ await this.syncRegistrationMetadata(
+ applicationRegistrationId,
+ manifest,
+ workspaceId,
+ );
+
return {
applicationUniversalIdentifier:
workspaceMigration.applicationUniversalIdentifier,
@@ -96,7 +129,7 @@ export class ApplicationDevelopmentResolver {
) {
return await this.applicationService.create({
...input,
- sourceType: 'local',
+ sourceType: AppRegistrationSourceType.LOCAL,
workspaceId,
});
}
@@ -142,4 +175,88 @@ export class ApplicationDevelopmentResolver {
settings: { isTemporaryFile: false, toDelete: false },
});
}
+
+ private async resolveApplicationRegistrationId(
+ universalIdentifier: string,
+ metadata: {
+ name: string;
+ description?: string;
+ logoUrl?: string;
+ author?: string;
+ websiteUrl?: string;
+ termsUrl?: string;
+ },
+ workspaceId: string,
+ ): Promise<string> {
+ const existingRegistration =
+ await this.applicationRegistrationService.findOneByUniversalIdentifier(
+ universalIdentifier,
+ );
+
+ if (existingRegistration) {
+ const isOwner =
+ await this.applicationRegistrationService.isOwnedByWorkspace(
+ existingRegistration.id,
+ workspaceId,
+ );
+
+ if (!isOwner) {
+ throw new ApplicationException(
+ 'Cannot sync application: registration is owned by another workspace',
+ ApplicationExceptionCode.FORBIDDEN,
+ );
+ }
+
+ return existingRegistration.id;
+ }
+
+ const { applicationRegistration: newRegistration } =
+ await this.applicationRegistrationService.create(
+ { ...metadata, universalIdentifier },
+ workspaceId,
+ null,
+ );
+
+ this.logger.log(
+ `Created app registration for ${metadata.name} (${universalIdentifier})`,
+ );
+
+ return newRegistration.id;
+ }
+
+ private async syncRegistrationMetadata(
+ applicationRegistrationId: string,
+ manifest: { application: ApplicationInput['manifest']['application'] },
+ workspaceId: string,
+ ): Promise<void> {
+ const isOwner =
+ await this.applicationRegistrationService.isOwnedByWorkspace(
+ applicationRegistrationId,
+ workspaceId,
+ );
+
+ if (isOwner) {
+ await this.applicationRegistrationService.update(
+ {
+ id: applicationRegistrationId,
+ update: {
+ name: manifest.application.displayName,
+ description: manifest.application.description,
+ logoUrl: manifest.application.logoUrl,
+ author: manifest.application.author,
+ websiteUrl: manifest.application.websiteUrl,
+ termsUrl: manifest.application.termsUrl,
+ },
+ },
+ workspaceId,
+ );
+
+ if (manifest.application.serverVariables) {
+ await this.applicationRegistrationVariableService.syncVariableSchemas(
+ applicationRegistrationId,
+ manifest.application.serverVariables,
+ );
+ }
+ }
+ }
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts
index 5d5b0965f3a..a70b239ff5a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-exception-filter.ts
@@ -7,6 +7,8 @@ import {
ApplicationExceptionCode,
} from 'src/engine/core-modules/application/application.exception';
import {
+ ForbiddenError,
+ InternalServerError,
NotFoundError,
UserInputError,
} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
@@ -23,8 +25,14 @@ export class ApplicationExceptionFilter implements ExceptionFilter {
case ApplicationExceptionCode.FRONT_COMPONENT_NOT_FOUND:
throw new NotFoundError(exception);
case ApplicationExceptionCode.FORBIDDEN:
+ throw new ForbiddenError(exception);
case ApplicationExceptionCode.INVALID_INPUT:
+ case ApplicationExceptionCode.SOURCE_CHANNEL_MISMATCH:
throw new UserInputError(exception);
+ case ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED:
+ case ApplicationExceptionCode.TARBALL_EXTRACTION_FAILED:
+ case ApplicationExceptionCode.UPGRADE_FAILED:
+ throw new InternalServerError(exception);
default: {
assertUnreachable(exception.code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.ts
new file mode 100644
index 00000000000..6fe9ab331ed
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/app-package-fetcher.service.ts
@@ -0,0 +1,285 @@
+import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';
+
+import { execFile } from 'child_process';
+import { promises as fs } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { promisify } from 'util';
+
+import { type Manifest } from 'twenty-shared/application';
+import { type PackageJson } from 'type-fest';
+import { v4 } from 'uuid';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+import { YARN_ENGINE_DIRNAME } from 'src/engine/core-modules/application/constants/yarn-engine-dirname';
+import { assertValidNpmPackageName } from 'src/engine/core-modules/application/utils/assert-valid-npm-package-name.util';
+import { extractTarballSecurely } from 'src/engine/core-modules/application/utils/extract-tarball-securely.util';
+import { readJsonFileOrThrow } from 'src/engine/core-modules/application/utils/read-json-file.util';
+import { resolvePackageContentDir } from 'src/engine/core-modules/application/utils/tarball-utils';
+import { FileStorageDriverFactory } from 'src/engine/core-modules/file-storage/file-storage-driver.factory';
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
+
+const execFilePromise = promisify(execFile);
+
+const APP_FETCHER_TMPDIR = join(tmpdir(), 'twenty-app-fetcher');
+const RESOLUTION_TIMEOUT_MS = 30_000;
+
+export type ResolvedPackage = {
+ extractedDir: string;
+ cleanupDir: string;
+ manifest: Manifest;
+ packageJson: PackageJson;
+};
+
+@Injectable()
+export class AppPackageFetcherService implements OnModuleInit {
+ private readonly logger = new Logger(AppPackageFetcherService.name);
+
+ constructor(
+ private readonly twentyConfigService: TwentyConfigService,
+ private readonly fileStorageDriverFactory: FileStorageDriverFactory,
+ ) {}
+
+ async onModuleInit(): Promise<void> {
+ try {
+ await fs.rm(APP_FETCHER_TMPDIR, { recursive: true, force: true });
+ } catch {
+ // best-effort cleanup of stale temp files from previous runs
+ }
+ }
+
+ async resolvePackage(
+ appRegistration: ApplicationRegistrationEntity,
+ options?: { targetVersion?: string },
+ ): Promise<ResolvedPackage | null> {
+ switch (appRegistration.sourceType) {
+ case AppRegistrationSourceType.NPM:
+ return this.resolveFromNpm(appRegistration, options?.targetVersion);
+ case AppRegistrationSourceType.TARBALL:
+ return this.resolveFromTarball(appRegistration);
+ case AppRegistrationSourceType.LOCAL:
+ return null;
+ }
+ }
+
+ async cleanupExtractedDir(extractedDir: string): Promise<void> {
+ try {
+ await fs.rm(extractedDir, { recursive: true, force: true });
+ } catch (error) {
+ this.logger.warn(`Failed to clean up ${extractedDir}: ${error}`);
+ }
+ }
+
+ private async resolveFromNpm(
+ appRegistration: ApplicationRegistrationEntity,
+ targetVersion?: string,
+ ): Promise<ResolvedPackage> {
+ const workDir = join(APP_FETCHER_TMPDIR, v4());
+
+ await fs.mkdir(workDir, { recursive: true });
+
+ try {
+ const registryUrl = this.twentyConfigService.get('APP_REGISTRY_URL');
+
+ const authToken = this.twentyConfigService.get('APP_REGISTRY_TOKEN');
+
+ if (!appRegistration.sourcePackage) {
+ throw new ApplicationException(
+ `App registration ${appRegistration.id} has sourceType=npm but no sourcePackage`,
+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,
+ );
+ }
+
+ const sourcePackage = appRegistration.sourcePackage;
+
+ assertValidNpmPackageName(sourcePackage);
+
+ const versionSpec = targetVersion ?? 'latest';
+
+ await this.writeNpmrc({
+ workDir,
+ packageName: sourcePackage,
+ registryUrl,
+ authToken,
+ });
+ await this.setupYarnEngine(workDir);
+ await this.writeMinimalPackageJson(workDir, sourcePackage, versionSpec);
+ await this.runYarnInstall(workDir);
+
+ const packageDir = join(workDir, 'node_modules', sourcePackage);
+ const manifest = await readJsonFileOrThrow<Manifest>(
+ packageDir,
+ 'manifest.json',
+ );
+ const packageJson = await readJsonFileOrThrow<PackageJson>(
+ packageDir,
+ 'package.json',
+ );
+
+ return {
+ extractedDir: packageDir,
+ cleanupDir: workDir,
+ manifest,
+ packageJson,
+ };
+ } catch (error) {
+ await this.cleanupExtractedDir(workDir);
+ throw new ApplicationException(
+ `Failed to resolve npm package ${appRegistration.sourcePackage}: ${error}`,
+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,
+ );
+ }
+ }
+
+ private async resolveFromTarball(
+ appRegistration: ApplicationRegistrationEntity,
+ ): Promise<ResolvedPackage> {
+ const workDir = join(APP_FETCHER_TMPDIR, v4());
+
+ await fs.mkdir(workDir, { recursive: true });
+
+ try {
+ const storagePath = join('app-tarball', appRegistration.id, 'app.tar.gz');
+ const driver = this.fileStorageDriverFactory.getCurrentDriver();
+ const tarballStream = await driver.readFile({
+ filePath: storagePath,
+ });
+ const tarballBuffer = await streamToBuffer(tarballStream);
+ const tarballPath = join(workDir, 'app.tar.gz');
+
+ await fs.writeFile(tarballPath, tarballBuffer);
+ await extractTarballSecurely(tarballPath, workDir);
+ await fs.rm(tarballPath);
+
+ const contentDir = await resolvePackageContentDir(workDir);
+ const manifest = await readJsonFileOrThrow<Manifest>(
+ contentDir,
+ 'manifest.json',
+ );
+ const packageJson = await readJsonFileOrThrow<PackageJson>(
+ contentDir,
+ 'package.json',
+ );
+
+ return {
+ extractedDir: contentDir,
+ cleanupDir: workDir,
+ manifest,
+ packageJson,
+ };
+ } catch (error) {
+ await this.cleanupExtractedDir(workDir);
+
+ if (error instanceof ApplicationException) {
+ throw error;
+ }
+
+ throw new ApplicationException(
+ `Failed to resolve tarball for app ${appRegistration.universalIdentifier}: ${error}`,
+ ApplicationExceptionCode.TARBALL_EXTRACTION_FAILED,
+ );
+ }
+ }
+
+ // Note: .npmrc settings take precedence over publishConfig.registry in
+ // individual packages. This is correct for our use case since we want
+ // to control the registry at the resolver level.
+ private async writeNpmrc(config: {
+ workDir: string;
+ packageName: string;
+ registryUrl: string;
+ authToken?: string;
+ }): Promise<void> {
+ const lines: string[] = [];
+ const registryHost = new URL(config.registryUrl).host;
+
+ if (config.packageName.startsWith('@')) {
+ const scope = config.packageName.split('/')[0];
+
+ lines.push(`${scope}:registry=${config.registryUrl}`);
+ } else if (config.registryUrl !== 'https://registry.npmjs.org') {
+ lines.push(`registry=${config.registryUrl}`);
+ }
+
+ if (config.authToken) {
+ lines.push(`//${registryHost}/:_authToken=${config.authToken}`);
+ }
+
+ if (lines.length > 0) {
+ await fs.writeFile(
+ join(config.workDir, '.npmrc'),
+ lines.join('\n') + '\n',
+ );
+ }
+ }
+
+ private async setupYarnEngine(workDir: string): Promise<void> {
+ await fs.cp(YARN_ENGINE_DIRNAME, workDir, { recursive: true });
+ }
+
+ private async writeMinimalPackageJson(
+ workDir: string,
+ packageName: string,
+ versionSpec: string,
+ ): Promise<void> {
+ const packageJson = {
+ name: 'twenty-app-resolver-workspace',
+ private: true,
+ dependencies: {
+ [packageName]: versionSpec,
+ },
+ };
+
+ await fs.writeFile(
+ join(workDir, 'package.json'),
+ JSON.stringify(packageJson, null, 2),
+ );
+ }
+
+ private async resolveLocalYarnPath(workDir: string): Promise<string> {
+ const yarnrcPath = join(workDir, '.yarnrc.yml');
+ const yarnrcContent = await fs.readFile(yarnrcPath, 'utf-8');
+ const match = yarnrcContent.match(/^yarnPath:\s*(.+)$/m);
+
+ if (!match) {
+ throw new ApplicationException(
+ 'yarnPath not found in .yarnrc.yml',
+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,
+ );
+ }
+
+ return join(workDir, match[1].trim());
+ }
+
+ private async runYarnInstall(workDir: string): Promise<void> {
+ const localYarnPath = await this.resolveLocalYarnPath(workDir);
+
+ const { NODE_OPTIONS: _nodeOptions, ...cleanEnv } = process.env;
+
+ try {
+ await execFilePromise(
+ process.execPath,
+ [localYarnPath, 'install', '--no-immutable'],
+ {
+ cwd: workDir,
+ env: cleanEnv,
+ timeout: RESOLUTION_TIMEOUT_MS,
+ },
+ );
+ } catch (error: unknown) {
+ const errorMessage =
+ error instanceof Error ? error.message : String(error);
+
+ throw new ApplicationException(
+ `yarn install failed: ${errorMessage}`,
+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,
+ );
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.ts
new file mode 100644
index 00000000000..53f7e0aacf6
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/app-upgrade.service.ts
@@ -0,0 +1,134 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import axios from 'axios';
+import { Repository } from 'typeorm';
+import { z } from 'zod';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+
+const npmPackageMetadataSchema = z.object({
+ version: z.string(),
+});
+
+@Injectable()
+export class AppUpgradeService {
+ private readonly logger = new Logger(AppUpgradeService.name);
+
+ constructor(
+ @InjectRepository(ApplicationRegistrationEntity)
+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
+ @InjectRepository(ApplicationEntity)
+ private readonly applicationRepository: Repository<ApplicationEntity>,
+ private readonly applicationInstallService: ApplicationInstallService,
+ private readonly twentyConfigService: TwentyConfigService,
+ ) {}
+
+ async checkForUpdates(
+ appRegistration: ApplicationRegistrationEntity,
+ ): Promise<string | null> {
+ if (appRegistration.sourceType !== AppRegistrationSourceType.NPM) {
+ return null;
+ }
+
+ const registryUrl = this.twentyConfigService.get('APP_REGISTRY_URL');
+
+ if (!appRegistration.sourcePackage) {
+ return null;
+ }
+
+ try {
+ const encodedPackage = encodeURIComponent(appRegistration.sourcePackage);
+
+ const { data } = await axios.get(
+ `${registryUrl}/${encodedPackage}/latest`,
+ {
+ headers: { 'User-Agent': 'Twenty-AppUpgrade' },
+ timeout: 10_000,
+ },
+ );
+
+ const parsed = npmPackageMetadataSchema.safeParse(data);
+
+ if (!parsed.success) {
+ this.logger.warn(
+ `Unexpected response shape from registry for ${appRegistration.sourcePackage}`,
+ );
+
+ return null;
+ }
+
+ await this.appRegistrationRepository.update(appRegistration.id, {
+ latestAvailableVersion: parsed.data.version,
+ });
+
+ return parsed.data.version;
+ } catch (error) {
+ this.logger.warn(
+ `Failed to check updates for ${appRegistration.sourcePackage}: ${error}`,
+ );
+
+ return null;
+ }
+ }
+
+ async checkAllForUpdates(): Promise<void> {
+ const npmRegistrations = await this.appRegistrationRepository.find({
+ where: { sourceType: AppRegistrationSourceType.NPM },
+ });
+
+ for (const registration of npmRegistrations) {
+ await this.checkForUpdates(registration);
+ }
+ }
+
+ async upgradeApplication(params: {
+ appRegistrationId: string;
+ targetVersion: string;
+ workspaceId: string;
+ }): Promise<boolean> {
+ const appRegistration = await this.appRegistrationRepository.findOneOrFail({
+ where: { id: params.appRegistrationId },
+ });
+
+ if (
+ appRegistration.sourceType === AppRegistrationSourceType.LOCAL ||
+ appRegistration.sourceType === AppRegistrationSourceType.TARBALL
+ ) {
+ throw new ApplicationException(
+ 'Cannot upgrade an app installed from a tarball or local source',
+ ApplicationExceptionCode.UPGRADE_FAILED,
+ );
+ }
+
+ try {
+ return await this.applicationInstallService.installApplication({
+ appRegistrationId: params.appRegistrationId,
+ version: params.targetVersion,
+ workspaceId: params.workspaceId,
+ });
+ } catch (error) {
+ const appName =
+ appRegistration.sourcePackage ?? appRegistration.universalIdentifier;
+
+ this.logger.error(`Upgrade failed for ${appName}`, error);
+
+ if (error instanceof ApplicationException) {
+ throw error;
+ }
+
+ throw new ApplicationException(
+ `Upgrade failed for ${appName}`,
+ ApplicationExceptionCode.UPGRADE_FAILED,
+ );
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-sync.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts
similarity index 56%
rename from packages/twenty-server/src/engine/core-modules/application/application-sync.module.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts
index a8e8c025e31..8f5dfa38321 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-sync.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts
@@ -1,20 +1,25 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { ApplicationRegistrationModule } from 'src/engine/core-modules/application-registration/application-registration.module';
+import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
-import { ApplicationDevelopmentResolver } from 'src/engine/core-modules/application/resolvers/application-development.resolver';
-import { ApplicationResolver } from 'src/engine/core-modules/application/resolvers/application.resolver';
-import { MarketplaceResolver } from 'src/engine/core-modules/application/resolvers/marketplace.resolver';
-import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/services/application-manifest-migration.service';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/services/application-sync.service';
-import { ApplicationVariableEntityModule } from 'src/engine/core-modules/applicationVariable/application-variable.module';
+import { ApplicationInstallResolver } from 'src/engine/core-modules/application/application-install/application-install.resolver';
+import { AppPackageFetcherService } from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';
+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
+import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-install/application-manifest-migration.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
+import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';
+import { ApplicationVariableEntityModule } from 'src/engine/core-modules/application/application-variable/application-variable.module';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';
import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
@@ -24,9 +29,14 @@ import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workf
@Module({
imports: [
- TypeOrmModule.forFeature([FileEntity]),
- ApplicationRegistrationModule,
+ TypeOrmModule.forFeature([
+ FileEntity,
+ ApplicationRegistrationEntity,
+ ApplicationEntity,
+ ]),
ApplicationModule,
+ CacheLockModule,
+ FeatureFlagModule,
ApplicationVariableEntityModule,
TokenModule,
WorkspaceMigrationModule,
@@ -38,15 +48,22 @@ import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workf
FileStorageModule,
WorkspaceCacheModule,
WorkspaceMigrationRunnerModule,
+ TwentyConfigModule,
],
providers: [
- ApplicationResolver,
- ApplicationDevelopmentResolver,
- MarketplaceResolver,
+ ApplicationInstallResolver,
ApplicationManifestMigrationService,
ApplicationSyncService,
+ AppPackageFetcherService,
+ ApplicationInstallService,
+ AppUpgradeService,
WorkspaceMigrationGraphqlApiExceptionInterceptor,
],
- exports: [ApplicationSyncService],
+ exports: [
+ ApplicationSyncService,
+ AppPackageFetcherService,
+ ApplicationInstallService,
+ AppUpgradeService,
+ ],
})
-export class ApplicationSyncModule {}
+export class ApplicationInstallModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/resolvers/application.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/application/resolvers/application.resolver.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
index 18479df0611..a41d36fd340 100644
--- a/packages/twenty-server/src/engine/core-modules/application/resolvers/application.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
@@ -12,22 +12,25 @@ import { FeatureFlagKey } from 'twenty-shared/types';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
-import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import {
ApplicationException,
ApplicationExceptionCode,
} from 'src/engine/core-modules/application/application.exception';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';
import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
import { InstallApplicationInput } from 'src/engine/core-modules/application/dtos/install-application.input';
import { UninstallApplicationInput } from 'src/engine/core-modules/application/dtos/uninstallApplicationInput';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/services/application-sync.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
+import {
+ FeatureFlagGuard,
+ RequireFeatureFlag,
+} from 'src/engine/guards/feature-flag.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -39,19 +42,18 @@ import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/wo
@MetadataResolver()
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
-export class ApplicationResolver {
+@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
+export class ApplicationInstallResolver {
constructor(
- private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
- private readonly applicationSyncService: ApplicationSyncService,
private readonly applicationService: ApplicationService,
private readonly applicationTokenService: ApplicationTokenService,
+ private readonly applicationSyncService: ApplicationSyncService,
+ private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
private readonly workspaceCacheService: WorkspaceCacheService,
) {}
@Query(() => [ApplicationDTO])
@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
async findManyApplications(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
) {
@@ -60,11 +62,13 @@ export class ApplicationResolver {
@Query(() => ApplicationDTO)
@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
- @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
async findOneApplication(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@Args('id', { type: () => UUIDScalarType, nullable: true }) id?: string,
- @Args('universalIdentifier', { type: () => UUIDScalarType, nullable: true })
+ @Args('universalIdentifier', {
+ type: () => UUIDScalarType,
+ nullable: true,
+ })
universalIdentifier?: string,
) {
return await this.applicationService.findOneApplicationOrThrow({
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts
new file mode 100644
index 00000000000..c757f94a16a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts
@@ -0,0 +1,215 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { promises as fs } from 'fs';
+import { join, relative } from 'path';
+
+import { FileFolder } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
+import {
+ AppPackageFetcherService,
+ type ResolvedPackage,
+} from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
+import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
+import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
+
+const FILE_FOLDER_MAPPING: Record<string, FileFolder> = {
+ 'package.json': FileFolder.Dependencies,
+ 'yarn.lock': FileFolder.Dependencies,
+};
+
+const FILE_FOLDER_PATTERN_MAPPING: Array<{
+ pattern: RegExp;
+ folder: FileFolder;
+}> = [
+ { pattern: /\.function\.mjs$/, folder: FileFolder.BuiltLogicFunction },
+ {
+ pattern: /\.front-component\.mjs$/,
+ folder: FileFolder.BuiltFrontComponent,
+ },
+ { pattern: /^public\//, folder: FileFolder.PublicAsset },
+];
+
+@Injectable()
+export class ApplicationInstallService {
+ private readonly logger = new Logger(ApplicationInstallService.name);
+
+ constructor(
+ @InjectRepository(ApplicationRegistrationEntity)
+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
+ @InjectRepository(ApplicationEntity)
+ private readonly applicationRepository: Repository<ApplicationEntity>,
+ private readonly appPackageFetcherService: AppPackageFetcherService,
+ private readonly applicationSyncService: ApplicationSyncService,
+ private readonly fileStorageService: FileStorageService,
+ private readonly cacheLockService: CacheLockService,
+ ) {}
+
+ async installApplication(params: {
+ appRegistrationId: string;
+ version?: string;
+ workspaceId: string;
+ }): Promise<boolean> {
+ const appRegistration = await this.appRegistrationRepository.findOneOrFail({
+ where: { id: params.appRegistrationId },
+ });
+
+ if (appRegistration.sourceType === AppRegistrationSourceType.LOCAL) {
+ this.logger.log(
+ `Skipping install for LOCAL app ${appRegistration.universalIdentifier} (files synced by CLI watcher in dev mode)`,
+ );
+
+ return true;
+ }
+
+ const lockKey = `app-install:${params.workspaceId}:${appRegistration.universalIdentifier}`;
+
+ return this.cacheLockService.withLock(
+ () =>
+ this.doInstallApplication(appRegistration, {
+ version: params.version,
+ workspaceId: params.workspaceId,
+ }),
+ lockKey,
+ { ttl: 60_000, ms: 500, maxRetries: 120 },
+ );
+ }
+
+ private async doInstallApplication(
+ appRegistration: ApplicationRegistrationEntity,
+ params: { version?: string; workspaceId: string },
+ ): Promise<boolean> {
+ let resolvedPackage: ResolvedPackage | null = null;
+
+ try {
+ resolvedPackage = await this.appPackageFetcherService.resolvePackage(
+ appRegistration,
+ { targetVersion: params.version },
+ );
+
+ if (!resolvedPackage) {
+ return true;
+ }
+
+ await this.writeFilesToStorage(
+ resolvedPackage.extractedDir,
+ appRegistration.universalIdentifier,
+ params.workspaceId,
+ );
+
+ await this.applicationSyncService.synchronizeFromManifest({
+ workspaceId: params.workspaceId,
+ manifest: resolvedPackage.manifest,
+ applicationRegistrationId: appRegistration.id,
+ });
+
+ await this.updateApplicationSourceType(
+ appRegistration.universalIdentifier,
+ params.workspaceId,
+ appRegistration.sourceType,
+ );
+
+ this.logger.log(
+ `Successfully installed app ${appRegistration.universalIdentifier} v${resolvedPackage.packageJson.version ?? 'unknown'}`,
+ );
+
+ return true;
+ } catch (error) {
+ this.logger.error(
+ `Failed to install app ${appRegistration.universalIdentifier}: ${error}`,
+ );
+
+ throw error;
+ } finally {
+ if (resolvedPackage) {
+ await this.appPackageFetcherService.cleanupExtractedDir(
+ resolvedPackage.cleanupDir,
+ );
+ }
+ }
+ }
+
+ private async writeFilesToStorage(
+ extractedDir: string,
+ applicationUniversalIdentifier: string,
+ workspaceId: string,
+ ): Promise<void> {
+ const files = await this.collectFiles(extractedDir);
+
+ for (const filePath of files) {
+ const relativePath = relative(extractedDir, filePath);
+ const fileFolder = this.resolveFileFolder(relativePath);
+ const content = await fs.readFile(filePath);
+
+ await this.fileStorageService.writeFile({
+ sourceFile: content,
+ mimeType: undefined,
+ fileFolder,
+ applicationUniversalIdentifier,
+ workspaceId,
+ resourcePath: relativePath,
+ settings: { isTemporaryFile: false, toDelete: false },
+ });
+ }
+ }
+
+ private resolveFileFolder(relativePath: string): FileFolder {
+ const exact = FILE_FOLDER_MAPPING[relativePath];
+
+ if (isDefined(exact)) {
+ return exact;
+ }
+
+ for (const { pattern, folder } of FILE_FOLDER_PATTERN_MAPPING) {
+ if (pattern.test(relativePath)) {
+ return folder;
+ }
+ }
+
+ return FileFolder.Source;
+ }
+
+ private async collectFiles(dir: string): Promise<string[]> {
+ const result: string[] = [];
+ const entries = await fs.readdir(dir, { withFileTypes: true });
+
+ for (const entry of entries) {
+ const fullPath = join(dir, entry.name);
+
+ if (entry.name === 'node_modules' || entry.name === '.yarn') {
+ continue;
+ }
+
+ if (entry.isSymbolicLink()) {
+ continue;
+ }
+
+ if (entry.isDirectory()) {
+ const subFiles = await this.collectFiles(fullPath);
+
+ result.push(...subFiles);
+ } else {
+ result.push(fullPath);
+ }
+ }
+
+ return result;
+ }
+
+ private async updateApplicationSourceType(
+ universalIdentifier: string,
+ workspaceId: string,
+ sourceType: AppRegistrationSourceType,
+ ): Promise<void> {
+ await this.applicationRepository.update(
+ { universalIdentifier, workspaceId },
+ { sourceType },
+ );
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/application-manifest-migration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.ts
similarity index 99%
rename from packages/twenty-server/src/engine/core-modules/application/services/application-manifest-migration.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.ts
index 1c830aaf16a..da6d70702af 100644
--- a/packages/twenty-server/src/engine/core-modules/application/services/application-manifest-migration.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-manifest-migration.service.ts
@@ -8,7 +8,7 @@ import {
ApplicationException,
ApplicationExceptionCode,
} from 'src/engine/core-modules/application/application.exception';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util';
import { computeApplicationManifestAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/compute-application-manifest-all-universal-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/application-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.ts
similarity index 70%
rename from packages/twenty-server/src/engine/core-modules/application/services/application-sync.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.ts
index c7430778f69..e64cd7aba01 100644
--- a/packages/twenty-server/src/engine/core-modules/application/services/application-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-sync.service.ts
@@ -1,25 +1,23 @@
import { Injectable, Logger } from '@nestjs/common';
+import { type Manifest } from 'twenty-shared/application';
import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
import { FileFolder } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { PackageJson } from 'type-fest';
-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application-registration/application-registration-variable.service';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import {
ApplicationException,
ApplicationExceptionCode,
} from 'src/engine/core-modules/application/application.exception';
-import { ApplicationInput } from 'src/engine/core-modules/application/dtos/application.input';
-import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/services/application-manifest-migration.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-install/application-manifest-migration.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { buildFromToAllUniversalFlatEntityMaps } from 'src/engine/core-modules/application/utils/build-from-to-all-universal-flat-entity-maps.util';
import { getApplicationSubAllFlatEntityMaps } from 'src/engine/core-modules/application/utils/get-application-sub-all-flat-entity-maps.util';
import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/utils/get-default-application-package-fields.util';
-import { ApplicationVariableEntityService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
+import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { createEmptyAllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-all-flat-entity-maps.constant';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
@@ -40,19 +38,21 @@ export class ApplicationSyncService {
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly fileStorageService: FileStorageService,
- private readonly applicationRegistrationService: ApplicationRegistrationService,
- private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,
) {}
public async synchronizeFromManifest({
workspaceId,
manifest,
- }: ApplicationInput & {
+ applicationRegistrationId,
+ }: {
workspaceId: string;
+ manifest: Manifest;
+ applicationRegistrationId?: string;
}): Promise<WorkspaceMigration> {
const application = await this.syncApplication({
workspaceId,
manifest,
+ applicationRegistrationId,
});
const ownerFlatApplication: FlatApplication = application;
@@ -64,7 +64,7 @@ export class ApplicationSyncService {
ownerFlatApplication,
});
- this.logger.log('✅ Application sync from manifest completed');
+ this.logger.log('Application sync from manifest completed');
return workspaceMigration;
}
@@ -72,8 +72,11 @@ export class ApplicationSyncService {
private async syncApplication({
workspaceId,
manifest,
- }: ApplicationInput & {
+ applicationRegistrationId,
+ }: {
workspaceId: string;
+ manifest: Manifest;
+ applicationRegistrationId?: string;
}): Promise<ApplicationEntity> {
const name = manifest.application.displayName;
const packageJson = JSON.parse(
@@ -103,7 +106,7 @@ export class ApplicationSyncService {
name,
description: manifest.application.description,
version: packageJson.version,
- sourcePath: 'cli-sync', // Placeholder for CLI-synced apps
+ sourcePath: 'cli-sync',
defaultRoleId: null,
workspaceId,
packageJsonChecksum: defaultPackageFields.packageJsonChecksum,
@@ -122,47 +125,8 @@ export class ApplicationSyncService {
},
);
- const applicationRegistrationMetadata = {
- name,
- description: manifest.application.description,
- logoUrl: manifest.application.logoUrl,
- author: manifest.application.author,
- websiteUrl: manifest.application.websiteUrl,
- termsUrl: manifest.application.termsUrl,
- };
-
- const applicationRegistrationId =
- await this.resolveApplicationRegistrationId(
- application.applicationRegistrationId,
- manifest.application.universalIdentifier,
- applicationRegistrationMetadata,
- workspaceId,
- );
-
- // Only update registration metadata if this workspace owns it.
- // Other workspaces that install the same app attach to the existing
- // registration but must not be able to modify its metadata.
- if (
- await this.applicationRegistrationService.isOwnedByWorkspace(
- applicationRegistrationId,
- workspaceId,
- )
- ) {
- await this.applicationRegistrationService.update(
- {
- id: applicationRegistrationId,
- update: applicationRegistrationMetadata,
- },
- workspaceId,
- );
- }
-
- if (manifest.application.serverVariables) {
- await this.applicationRegistrationVariableService.syncVariableSchemas(
- applicationRegistrationId,
- manifest.application.serverVariables,
- );
- }
+ const resolvedRegistrationId =
+ applicationRegistrationId ?? application.applicationRegistrationId;
return await this.applicationService.update(application.id, {
name,
@@ -170,7 +134,8 @@ export class ApplicationSyncService {
version: packageJson.version,
packageJsonChecksum: manifest.application.packageJsonChecksum,
yarnLockChecksum: manifest.application.yarnLockChecksum,
- applicationRegistrationId,
+ applicationRegistrationId: resolvedRegistrationId,
+ workspaceId,
});
}
@@ -250,44 +215,4 @@ export class ApplicationSyncService {
return validateAndBuildResult.workspaceMigration;
}
-
- private async resolveApplicationRegistrationId(
- existingId: string | null,
- universalIdentifier: string,
- metadata: {
- name: string;
- description?: string;
- logoUrl?: string;
- author?: string;
- websiteUrl?: string;
- termsUrl?: string;
- },
- workspaceId: string,
- ): Promise<string> {
- if (existingId) {
- return existingId;
- }
-
- const existingRegistration =
- await this.applicationRegistrationService.findOneByUniversalIdentifier(
- universalIdentifier,
- );
-
- if (existingRegistration) {
- return existingRegistration.id;
- }
-
- const { applicationRegistration: newRegistration } =
- await this.applicationRegistrationService.create(
- { ...metadata, universalIdentifier },
- workspaceId,
- null,
- );
-
- this.logger.log(
- `Created app registration for ${metadata.name} (${universalIdentifier})`,
- );
-
- return newRegistration.id;
- }
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant.ts
new file mode 100644
index 00000000000..fb6e4cd0478
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant.ts
@@ -0,0 +1,179 @@
+import { type MarketplaceDisplayData } from 'src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type';
+
+export type CuratedAppEntry = {
+ universalIdentifier: string;
+ sourcePackage: string;
+ isFeatured: boolean;
+
+ name: string;
+ description: string;
+ author: string;
+ logoUrl?: string;
+ websiteUrl?: string;
+ termsUrl?: string;
+
+ richDisplayData: MarketplaceDisplayData;
+};
+
+const MOCK_ENRICHMENT_APP_ID = 'a1b2c3d4-0000-0000-0000-000000000001';
+const MOCK_ENRICHMENT_JOB_ID = 'a1b2c3d4-0000-0000-0000-000000000100';
+
+const COMPANY_UNIVERSAL_ID = '20202020-b374-4779-a561-80086cb2e17f';
+const PERSON_UNIVERSAL_ID = '20202020-e674-48e5-a542-72570eee7213';
+
+const MOCK_LOGO_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" fill="#1a2744"><ellipse cx="38" cy="20" rx="28" ry="10"/><rect x="10" y="20" width="56" height="50"/><ellipse cx="38" cy="70" rx="28" ry="10"/><ellipse cx="38" cy="35" rx="28" ry="10" fill="none" stroke="#fff" stroke-width="3"/><ellipse cx="38" cy="52" rx="28" ry="10" fill="none" stroke="#fff" stroke-width="3"/><circle cx="72" cy="62" r="22" fill="#1a2744"/><circle cx="72" cy="62" r="18" fill="#fff"/><path d="M72 50 L72 74 M62 58 L72 48 L82 58" stroke="#1a2744" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/></svg>`;
+const ENCODED_MOCK_LOGO = `data:image/svg+xml,${encodeURIComponent(MOCK_LOGO_SVG)}`;
+
+export const MARKETPLACE_CATALOG_INDEX: CuratedAppEntry[] = [
+ {
+ universalIdentifier: MOCK_ENRICHMENT_APP_ID,
+ sourcePackage: '@twentyhq/app-data-enrichment',
+ isFeatured: true,
+ name: 'Data Enrichment',
+ description: 'Enrich your data easily. Choose your provider.',
+ author: 'Twenty',
+ logoUrl: ENCODED_MOCK_LOGO,
+ websiteUrl: 'https://twenty.com',
+ richDisplayData: {
+ icon: 'IconSparkles',
+ version: '1.0.0',
+ category: 'Data',
+ logo: ENCODED_MOCK_LOGO,
+ screenshots: [
+ 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+1',
+ 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+2',
+ 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+3',
+ ],
+ aboutDescription:
+ 'Enhance your workspace with automated data intelligence. This app monitors your new records and automatically populates missing details such as job titles, company size, social profiles, and industry insights.',
+ providers: ['Clearbit', 'Apollo', 'Hunter.io'],
+ objects: [
+ {
+ universalIdentifier: MOCK_ENRICHMENT_JOB_ID,
+ nameSingular: 'enrichmentJob',
+ namePlural: 'enrichmentJobs',
+ labelSingular: 'Enrichment Job',
+ labelPlural: 'Enrichment Jobs',
+ description: 'Tracks data enrichment requests and their status',
+ icon: 'IconSparkles',
+ fields: [
+ {
+ name: 'status',
+ type: 'SELECT',
+ label: 'Status',
+ description: 'Current status of the enrichment job',
+ icon: 'IconProgressCheck',
+ universalIdentifier: 'a1b2c3d4-0000-0000-0000-000000000101',
+ objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_ID,
+ },
+ {
+ name: 'provider',
+ type: 'TEXT',
+ label: 'Provider',
+ description: 'Enrichment provider used',
+ icon: 'IconCloud',
+ universalIdentifier: 'a1b2c3d4-0000-0000-0000-000000000102',
+ objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_ID,
+ },
+ ],
+ },
+ ],
+ fields: [
+ {
+ name: 'industry',
+ type: 'TEXT',
+ label: 'Industry',
+ description: 'Company industry from enrichment',
+ icon: 'IconBuildingFactory2',
+ objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
+ universalIdentifier: 'a1b2c3d4-0000-0000-0000-000000000201',
+ },
+ {
+ name: 'linkedInUrl',
+ type: 'LINKS',
+ label: 'LinkedIn URL',
+ description: 'LinkedIn profile URL from enrichment',
+ icon: 'IconBrandLinkedin',
+ objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
+ universalIdentifier: 'a1b2c3d4-0000-0000-0000-000000000203',
+ },
+ ],
+ logicFunctions: [
+ {
+ name: 'enrich-on-create',
+ description:
+ 'Automatically enriches new records when they are created',
+ timeoutSeconds: 30,
+ },
+ ],
+ frontComponents: [],
+ defaultRole: {
+ id: 'a1b2c3d4-0000-0000-0000-000000000010',
+ label: 'Data Enrichment default role',
+ description: 'Default permissions for the Data Enrichment app',
+ canReadAllObjectRecords: true,
+ canUpdateAllObjectRecords: true,
+ canSoftDeleteAllObjectRecords: true,
+ canDestroyAllObjectRecords: true,
+ canUpdateAllSettings: false,
+ canAccessAllTools: false,
+ objectPermissions: [
+ {
+ objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: false,
+ canDestroyObjectRecords: false,
+ },
+ {
+ objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: true,
+ canDestroyObjectRecords: false,
+ },
+ ],
+ fieldPermissions: [],
+ permissionFlags: ['DATA_MODEL', 'API_KEYS_AND_WEBHOOKS'],
+ },
+ },
+ },
+ {
+ universalIdentifier: '4ec0391d-18d5-411c-b2f3-266ddc1c3ef7',
+ sourcePackage: '@twentyhq/hello-world',
+ isFeatured: false,
+ name: 'Hello World',
+ description: 'A simple hello world app to get started with Twenty apps.',
+ author: 'Twenty',
+ websiteUrl: 'https://twenty.com',
+ richDisplayData: {
+ icon: 'IconWorld',
+ version: '0.2.2',
+ category: 'Getting Started',
+ screenshots: [],
+ aboutDescription:
+ 'A minimal example app that demonstrates the Twenty app framework. Creates a PostCard object and a logic function to generate new postcards. Great starting point for building your own apps.',
+ providers: [],
+ objects: [
+ {
+ universalIdentifier: 'e2c3d4f5-0000-0000-0000-000000000001',
+ nameSingular: 'postCard',
+ namePlural: 'postCards',
+ labelSingular: 'Post Card',
+ labelPlural: 'Post Cards',
+ description: 'A simple postcard object',
+ icon: 'IconMail',
+ fields: [],
+ },
+ ],
+ fields: [],
+ logicFunctions: [
+ {
+ name: 'create-new-post-card',
+ description: 'Creates a new postcard record',
+ },
+ ],
+ frontComponents: [],
+ },
+ },
+];
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command.ts
new file mode 100644
index 00000000000..cd7ffd38a88
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command.ts
@@ -0,0 +1,35 @@
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MARKETPLACE_CATALOG_SYNC_CRON_PATTERN } from 'src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant';
+import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+
+@Command({
+ name: 'cron:marketplace-catalog-sync',
+ description:
+ 'Starts a cron job to sync the marketplace catalog into ApplicationRegistration',
+})
+export class MarketplaceCatalogSyncCronCommand extends CommandRunner {
+ constructor(
+ @InjectMessageQueue(MessageQueue.cronQueue)
+ private readonly messageQueueService: MessageQueueService,
+ ) {
+ super();
+ }
+
+ async run(): Promise<void> {
+ await this.messageQueueService.add(MarketplaceCatalogSyncCronJob.name, {});
+
+ await this.messageQueueService.addCron<undefined>({
+ jobName: MarketplaceCatalogSyncCronJob.name,
+ data: undefined,
+ options: {
+ repeat: {
+ pattern: MARKETPLACE_CATALOG_SYNC_CRON_PATTERN,
+ },
+ },
+ });
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant.ts
new file mode 100644
index 00000000000..eb40630d55e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant.ts
@@ -0,0 +1 @@
+export const MARKETPLACE_CATALOG_SYNC_CRON_PATTERN = '0 * * * *';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts
new file mode 100644
index 00000000000..e990c53dc99
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job.ts
@@ -0,0 +1,37 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
+import { MARKETPLACE_CATALOG_SYNC_CRON_PATTERN } from 'src/engine/core-modules/application/application-marketplace/crons/constants/marketplace-catalog-sync-cron-pattern.constant';
+import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+
+@Injectable()
+@Processor(MessageQueue.cronQueue)
+export class MarketplaceCatalogSyncCronJob {
+ private readonly logger = new Logger(MarketplaceCatalogSyncCronJob.name);
+
+ constructor(
+ private readonly marketplaceCatalogSyncService: MarketplaceCatalogSyncService,
+ ) {}
+
+ @Process(MarketplaceCatalogSyncCronJob.name)
+ @SentryCronMonitor(
+ MarketplaceCatalogSyncCronJob.name,
+ MARKETPLACE_CATALOG_SYNC_CRON_PATTERN,
+ )
+ async handle(): Promise<void> {
+ this.logger.log('Starting marketplace catalog sync...');
+
+ try {
+ await this.marketplaceCatalogSyncService.syncCatalog();
+ this.logger.log('Marketplace catalog sync completed successfully');
+ } catch (error) {
+ this.logger.error(
+ `Marketplace catalog sync failed: ${error instanceof Error ? error.message : String(error)}`,
+ );
+ throw error;
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/marketplace-app.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/application/dtos/marketplace-app.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts
index 1c2c123d005..478aeb88ac2 100644
--- a/packages/twenty-server/src/engine/core-modules/application/dtos/marketplace-app.dto.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto.ts
@@ -7,7 +7,9 @@ import {
IsOptional,
IsString,
MaxLength,
+ ValidateNested,
} from 'class-validator';
+import { Type } from 'class-transformer';
@ObjectType('MarketplaceAppField')
export class MarketplaceAppFieldDTO {
@@ -274,6 +276,13 @@ export class MarketplaceAppDTO {
frontComponents: MarketplaceAppFrontComponentDTO[];
@IsOptional()
+ @ValidateNested()
+ @Type(() => MarketplaceAppDefaultRoleDTO)
@Field(() => MarketplaceAppDefaultRoleDTO, { nullable: true })
defaultRole?: MarketplaceAppDefaultRoleDTO;
+
+ @IsOptional()
+ @IsString()
+ @Field({ nullable: true })
+ sourcePackage?: string;
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts
new file mode 100644
index 00000000000..a4aa1263711
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts
@@ -0,0 +1,38 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';
+import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
+import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service';
+import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-query.service';
+import { MarketplaceResolver } from 'src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver';
+import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace.service';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+
+@Module({
+ imports: [
+ TypeOrmModule.forFeature([ApplicationRegistrationEntity]),
+ ApplicationInstallModule,
+ FeatureFlagModule,
+ PermissionsModule,
+ TwentyConfigModule,
+ ],
+ providers: [
+ MarketplaceService,
+ MarketplaceCatalogSyncService,
+ MarketplaceQueryService,
+ MarketplaceCatalogSyncCronJob,
+ MarketplaceCatalogSyncCronCommand,
+ MarketplaceResolver,
+ ],
+ exports: [
+ MarketplaceCatalogSyncService,
+ MarketplaceQueryService,
+ MarketplaceCatalogSyncCronCommand,
+ ],
+})
+export class MarketplaceModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/marketplace/mocks/data-enrichment-logo.svg b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/mocks/data-enrichment-logo.svg
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/marketplace/mocks/data-enrichment-logo.svg
rename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/mocks/data-enrichment-logo.svg
diff --git a/packages/twenty-server/src/engine/core-modules/marketplace/mocks/mock-manifest.json b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/mocks/mock-manifest.json
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/marketplace/mocks/mock-manifest.json
rename to packages/twenty-server/src/engine/core-modules/application/application-marketplace/mocks/mock-manifest.json
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.ts
new file mode 100644
index 00000000000..9d3d17f5b99
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/resolvers/marketplace.resolver.ts
@@ -0,0 +1,114 @@
+import { UseFilters, UseGuards } from '@nestjs/common';
+import { Args, Mutation, Query } from '@nestjs/graphql';
+
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { FeatureFlagKey } from 'twenty-shared/types';
+
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
+import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';
+import {
+ ApplicationRegistrationException,
+ ApplicationRegistrationExceptionCode,
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
+import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';
+import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';
+import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-query.service';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import {
+ FeatureFlagGuard,
+ RequireFeatureFlag,
+} from 'src/engine/guards/feature-flag.guard';
+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
+import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+
+@MetadataResolver()
+@UseFilters(ApplicationRegistrationExceptionFilter)
+@UseGuards(
+ UserAuthGuard,
+ WorkspaceAuthGuard,
+ FeatureFlagGuard,
+ NoPermissionGuard,
+)
+export class MarketplaceResolver {
+ constructor(
+ private readonly marketplaceQueryService: MarketplaceQueryService,
+ private readonly applicationInstallService: ApplicationInstallService,
+ private readonly appUpgradeService: AppUpgradeService,
+ ) {}
+
+ @Query(() => [MarketplaceAppDTO])
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+ async findManyMarketplaceApps(): Promise<MarketplaceAppDTO[]> {
+ return this.marketplaceQueryService.findManyMarketplaceApps();
+ }
+
+ @Mutation(() => Boolean)
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+ async installMarketplaceApp(
+ @Args('universalIdentifier') universalIdentifier: string,
+ @Args('version', { type: () => String, nullable: true })
+ version: string | undefined,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ ): Promise<boolean> {
+ const registration =
+ await this.marketplaceQueryService.findRegistrationByUniversalIdentifier(
+ universalIdentifier,
+ );
+
+ if (registration.sourceType !== AppRegistrationSourceType.NPM) {
+ throw new ApplicationRegistrationException(
+ `Only NPM apps can be installed via the marketplace`,
+ ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH,
+ );
+ }
+
+ return this.applicationInstallService.installApplication({
+ appRegistrationId: registration.id,
+ version,
+ workspaceId: workspace.id,
+ });
+ }
+
+ @Mutation(() => Boolean)
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+ async installNpmApp(
+ @Args('packageName') packageName: string,
+ @Args('version', { type: () => String, nullable: true })
+ version: string | undefined,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ ): Promise<boolean> {
+ const registration =
+ await this.marketplaceQueryService.findOrCreateNpmRegistration({
+ packageName,
+ ownerWorkspaceId: workspace.id,
+ });
+
+ return this.applicationInstallService.installApplication({
+ appRegistrationId: registration.id,
+ version,
+ workspaceId: workspace.id,
+ });
+ }
+
+ @Mutation(() => Boolean)
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+ async upgradeApplication(
+ @Args('appRegistrationId') appRegistrationId: string,
+ @Args('targetVersion') targetVersion: string,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ ): Promise<boolean> {
+ return this.appUpgradeService.upgradeApplication({
+ appRegistrationId,
+ targetVersion,
+ workspaceId: workspace.id,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.ts
new file mode 100644
index 00000000000..0f840814134
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service.ts
@@ -0,0 +1,171 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { MARKETPLACE_CATALOG_INDEX } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant';
+import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace.service';
+import { getAdminWorkspaceId } from 'src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util';
+
+@Injectable()
+export class MarketplaceCatalogSyncService {
+ private readonly logger = new Logger(MarketplaceCatalogSyncService.name);
+
+ constructor(
+ @InjectRepository(ApplicationRegistrationEntity)
+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
+ private readonly marketplaceService: MarketplaceService,
+ ) {}
+
+ async syncCatalog(): Promise<void> {
+ const dataSource = this.appRegistrationRepository.manager.connection;
+ const adminWorkspaceId = await getAdminWorkspaceId(dataSource);
+
+ if (!isDefined(adminWorkspaceId)) {
+ this.logger.warn(
+ 'No admin workspace found. Skipping marketplace catalog sync.',
+ );
+
+ return;
+ }
+
+ await this.syncCuratedApps(adminWorkspaceId);
+ await this.syncNpmApps(adminWorkspaceId);
+
+ this.logger.log('Marketplace catalog sync completed');
+ }
+
+ private async syncCuratedApps(ownerWorkspaceId: string): Promise<void> {
+ for (const entry of MARKETPLACE_CATALOG_INDEX) {
+ try {
+ await this.upsertRegistration({
+ universalIdentifier: entry.universalIdentifier,
+ name: entry.name,
+ description:
+ entry.richDisplayData.aboutDescription ?? entry.description,
+ author: entry.author,
+ sourceType: AppRegistrationSourceType.NPM,
+ sourcePackage: entry.sourcePackage,
+ logoUrl: entry.logoUrl ?? null,
+ websiteUrl: entry.websiteUrl ?? null,
+ termsUrl: entry.termsUrl ?? null,
+ latestAvailableVersion: entry.richDisplayData.version ?? null,
+ isFeatured: entry.isFeatured,
+ marketplaceDisplayData: entry.richDisplayData,
+ ownerWorkspaceId,
+ });
+ } catch (error) {
+ this.logger.error(
+ `Failed to sync curated app "${entry.name}": ${error instanceof Error ? error.message : String(error)}`,
+ );
+ }
+ }
+ }
+
+ private async syncNpmApps(ownerWorkspaceId: string): Promise<void> {
+ const npmApps = await this.marketplaceService.fetchAppsFromNpmRegistry();
+
+ const curatedIdentifiers = new Set(
+ MARKETPLACE_CATALOG_INDEX.map((entry) => entry.universalIdentifier),
+ );
+
+ for (const app of npmApps) {
+ if (curatedIdentifiers.has(app.id)) {
+ continue;
+ }
+
+ try {
+ await this.upsertRegistration({
+ universalIdentifier: app.id,
+ name: app.name,
+ description: app.description,
+ author: app.author,
+ sourceType: AppRegistrationSourceType.NPM,
+ sourcePackage: app.sourcePackage ?? app.name,
+ logoUrl: null,
+ websiteUrl: app.websiteUrl ?? null,
+ termsUrl: null,
+ latestAvailableVersion: app.version ?? null,
+ isFeatured: false,
+ marketplaceDisplayData: null,
+ ownerWorkspaceId,
+ });
+ } catch (error) {
+ this.logger.error(
+ `Failed to sync npm app "${app.name}": ${error instanceof Error ? error.message : String(error)}`,
+ );
+ }
+ }
+ }
+
+ // Lookup by universalIdentifier only (matches the unique constraint).
+ // ownerWorkspaceId is only set on insert.
+ private async upsertRegistration(
+ params: Pick<
+ ApplicationRegistrationEntity,
+ | 'universalIdentifier'
+ | 'name'
+ | 'description'
+ | 'author'
+ | 'sourceType'
+ | 'sourcePackage'
+ | 'logoUrl'
+ | 'websiteUrl'
+ | 'termsUrl'
+ | 'latestAvailableVersion'
+ | 'isFeatured'
+ | 'marketplaceDisplayData'
+ | 'ownerWorkspaceId'
+ >,
+ ): Promise<void> {
+ const existing = await this.appRegistrationRepository.findOne({
+ where: {
+ universalIdentifier: params.universalIdentifier,
+ },
+ });
+
+ if (isDefined(existing)) {
+ await this.appRegistrationRepository.save({
+ ...existing,
+ name: params.name,
+ description: params.description,
+ author: params.author,
+ sourceType: params.sourceType,
+ sourcePackage: params.sourcePackage,
+ logoUrl: params.logoUrl,
+ websiteUrl: params.websiteUrl,
+ termsUrl: params.termsUrl,
+ latestAvailableVersion: params.latestAvailableVersion,
+ isFeatured: params.isFeatured,
+ marketplaceDisplayData: params.marketplaceDisplayData,
+ });
+
+ return;
+ }
+
+ const registration = this.appRegistrationRepository.create({
+ universalIdentifier: params.universalIdentifier,
+ name: params.name,
+ description: params.description,
+ author: params.author,
+ sourceType: params.sourceType,
+ sourcePackage: params.sourcePackage,
+ logoUrl: params.logoUrl,
+ websiteUrl: params.websiteUrl,
+ termsUrl: params.termsUrl,
+ latestAvailableVersion: params.latestAvailableVersion,
+ isFeatured: params.isFeatured,
+ marketplaceDisplayData: params.marketplaceDisplayData,
+ oAuthClientId: v4(),
+ oAuthRedirectUris: [],
+ oAuthScopes: [],
+ ownerWorkspaceId: params.ownerWorkspaceId,
+ });
+
+ await this.appRegistrationRepository.save(registration);
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.ts
new file mode 100644
index 00000000000..9a7dba2e9d4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace-query.service.ts
@@ -0,0 +1,162 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import {
+ ApplicationRegistrationException,
+ ApplicationRegistrationExceptionCode,
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import { assertValidNpmPackageName } from 'src/engine/core-modules/application/utils/assert-valid-npm-package-name.util';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
+import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+
+const MARKETPLACE_CACHE_TTL_MS = 5 * 60 * 1000;
+
+@Injectable()
+export class MarketplaceQueryService {
+ private readonly logger = new Logger(MarketplaceQueryService.name);
+ private cachedApps: MarketplaceAppDTO[] | null = null;
+ private cacheExpiresAt = 0;
+ private hasSyncBeenEnqueued = false;
+
+ constructor(
+ @InjectRepository(ApplicationRegistrationEntity)
+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
+ @InjectMessageQueue(MessageQueue.cronQueue)
+ private readonly messageQueueService: MessageQueueService,
+ ) {}
+
+ async findManyMarketplaceApps(): Promise<MarketplaceAppDTO[]> {
+ if (this.cachedApps !== null && Date.now() < this.cacheExpiresAt) {
+ return this.cachedApps;
+ }
+
+ const registrations = await this.appRegistrationRepository.find({
+ where: { sourceType: AppRegistrationSourceType.NPM },
+ });
+
+ if (registrations.length === 0) {
+ if (!this.hasSyncBeenEnqueued) {
+ this.hasSyncBeenEnqueued = true;
+ this.logger.log(
+ 'No marketplace registrations found, enqueuing one-time sync job',
+ );
+ await this.messageQueueService.add(
+ MarketplaceCatalogSyncCronJob.name,
+ {},
+ );
+ }
+
+ return [];
+ }
+
+ this.cachedApps = registrations.map((registration) =>
+ this.toMarketplaceAppDTO(registration),
+ );
+ this.cacheExpiresAt = Date.now() + MARKETPLACE_CACHE_TTL_MS;
+
+ return this.cachedApps;
+ }
+
+ async findRegistrationByUniversalIdentifier(
+ universalIdentifier: string,
+ ): Promise<ApplicationRegistrationEntity> {
+ const registration = await this.appRegistrationRepository.findOne({
+ where: { universalIdentifier },
+ });
+
+ if (!isDefined(registration)) {
+ throw new ApplicationRegistrationException(
+ `No application registration found for identifier "${universalIdentifier}"`,
+ ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,
+ );
+ }
+
+ return registration;
+ }
+
+ async findOrCreateNpmRegistration(params: {
+ packageName: string;
+ ownerWorkspaceId: string;
+ }): Promise<ApplicationRegistrationEntity> {
+ assertValidNpmPackageName(params.packageName);
+
+ const existing = await this.appRegistrationRepository.findOne({
+ where: { sourcePackage: params.packageName },
+ });
+
+ if (isDefined(existing)) {
+ return existing;
+ }
+
+ this.logger.log(
+ `Creating new registration for npm package "${params.packageName}"`,
+ );
+
+ try {
+ const registration = this.appRegistrationRepository.create({
+ universalIdentifier: v4(),
+ name: params.packageName,
+ sourceType: AppRegistrationSourceType.NPM,
+ sourcePackage: params.packageName,
+ oAuthClientId: v4(),
+ oAuthRedirectUris: [],
+ oAuthScopes: [],
+ ownerWorkspaceId: params.ownerWorkspaceId,
+ });
+
+ return await this.appRegistrationRepository.save(registration);
+ } catch {
+ const concurrentlyCreated = await this.appRegistrationRepository.findOne({
+ where: { sourcePackage: params.packageName },
+ });
+
+ if (isDefined(concurrentlyCreated)) {
+ return concurrentlyCreated;
+ }
+
+ throw new ApplicationRegistrationException(
+ `Failed to create registration for package "${params.packageName}"`,
+ ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND,
+ );
+ }
+ }
+
+ toMarketplaceAppDTO(
+ registration: ApplicationRegistrationEntity,
+ ): MarketplaceAppDTO {
+ const displayData = registration.marketplaceDisplayData;
+
+ return {
+ id: registration.universalIdentifier,
+ name: registration.name,
+ description: registration.description ?? '',
+ icon: displayData?.icon ?? 'IconApps',
+ version:
+ displayData?.version ?? registration.latestAvailableVersion ?? '0.0.0',
+ author: registration.author ?? 'Unknown',
+ category: displayData?.category ?? '',
+ logo: displayData?.logo,
+ screenshots: displayData?.screenshots ?? [],
+ aboutDescription:
+ displayData?.aboutDescription ?? registration.description ?? '',
+ providers: displayData?.providers ?? [],
+ websiteUrl: registration.websiteUrl ?? undefined,
+ termsUrl: registration.termsUrl ?? undefined,
+ objects: displayData?.objects ?? [],
+ fields: displayData?.fields ?? [],
+ logicFunctions: displayData?.logicFunctions ?? [],
+ frontComponents: displayData?.frontComponents ?? [],
+ sourcePackage: registration.sourcePackage ?? undefined,
+ defaultRole: displayData?.defaultRole,
+ };
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.ts
new file mode 100644
index 00000000000..c61c87449b8
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/services/marketplace.service.ts
@@ -0,0 +1,94 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import axios from 'axios';
+import { isDefined } from 'twenty-shared/utils';
+import { z } from 'zod';
+
+import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+
+const npmSearchResultSchema = z.object({
+ objects: z.array(
+ z.object({
+ package: z.object({
+ name: z.string(),
+ version: z.string(),
+ description: z.string().optional(),
+ keywords: z.array(z.string()).optional(),
+ author: z.object({ name: z.string().optional() }).optional(),
+ links: z.object({ homepage: z.string().optional() }).optional(),
+ }),
+ }),
+ ),
+});
+
+@Injectable()
+export class MarketplaceService {
+ private readonly logger = new Logger(MarketplaceService.name);
+
+ constructor(private readonly twentyConfigService: TwentyConfigService) {}
+
+ async fetchAppsFromNpmRegistry(): Promise<MarketplaceAppDTO[]> {
+ const registryUrl = this.twentyConfigService.get('APP_REGISTRY_URL');
+
+ try {
+ const { data } = await axios.get(
+ `${registryUrl}/-/v1/search?text=keywords:twenty-app&size=250`,
+ {
+ headers: { 'User-Agent': 'Twenty-Marketplace' },
+ timeout: 10_000,
+ },
+ );
+
+ const parsed = npmSearchResultSchema.safeParse(data);
+
+ if (!parsed.success) {
+ this.logger.warn(
+ `Unexpected npm search response shape: ${parsed.error.message}`,
+ );
+
+ return [];
+ }
+
+ return parsed.data.objects
+ .map((result) => {
+ const { name, version, description, author, links } = result.package;
+ const twentyKeyword = (result.package.keywords ?? []).find(
+ (keyword) => keyword.startsWith('twenty-uid:'),
+ );
+
+ if (!isDefined(twentyKeyword)) {
+ return null;
+ }
+
+ const universalIdentifier = twentyKeyword.replace('twenty-uid:', '');
+
+ return {
+ id: universalIdentifier,
+ name,
+ description: description ?? '',
+ icon: 'IconApps',
+ version,
+ author: author?.name ?? 'Unknown',
+ category: '',
+ screenshots: [],
+ aboutDescription: description ?? '',
+ providers: [],
+ websiteUrl: links?.homepage,
+ objects: [],
+ fields: [],
+ logicFunctions: [],
+ frontComponents: [],
+ sourcePackage: name,
+ };
+ })
+ .filter(isDefined);
+ } catch (error) {
+ this.logger.warn(
+ `Failed to fetch apps from npm registry: ${error instanceof Error ? error.message : String(error)}`,
+ );
+
+ return [];
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type.ts
new file mode 100644
index 00000000000..67765f8b06a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type.ts
@@ -0,0 +1,75 @@
+// Rich display data stored alongside ApplicationRegistration for marketplace
+// rendering. This is denormalized from the catalog source so it can be displayed
+// pre-install without resolving the package.
+export type MarketplaceDisplayData = {
+ icon?: string;
+ version?: string;
+ category?: string;
+ logo?: string;
+ screenshots?: string[];
+ aboutDescription?: string;
+ providers?: string[];
+ objects?: MarketplaceDisplayObject[];
+ fields?: MarketplaceDisplayField[];
+ logicFunctions?: MarketplaceDisplayLogicFunction[];
+ frontComponents?: MarketplaceDisplayFrontComponent[];
+ defaultRole?: MarketplaceDisplayDefaultRole;
+};
+
+type MarketplaceDisplayObject = {
+ universalIdentifier: string;
+ nameSingular: string;
+ namePlural: string;
+ labelSingular: string;
+ labelPlural: string;
+ description?: string;
+ icon?: string;
+ fields: MarketplaceDisplayField[];
+};
+
+type MarketplaceDisplayField = {
+ name: string;
+ type: string;
+ label: string;
+ description?: string;
+ icon?: string;
+ objectUniversalIdentifier: string;
+ universalIdentifier: string;
+};
+
+type MarketplaceDisplayLogicFunction = {
+ name: string;
+ description?: string;
+ timeoutSeconds?: number;
+};
+
+type MarketplaceDisplayFrontComponent = {
+ name: string;
+ description?: string;
+};
+
+type MarketplaceDisplayDefaultRole = {
+ id: string;
+ label: string;
+ description?: string;
+ canReadAllObjectRecords: boolean;
+ canUpdateAllObjectRecords: boolean;
+ canSoftDeleteAllObjectRecords: boolean;
+ canDestroyAllObjectRecords: boolean;
+ canUpdateAllSettings: boolean;
+ canAccessAllTools: boolean;
+ objectPermissions: Array<{
+ objectUniversalIdentifier: string;
+ canReadObjectRecords?: boolean;
+ canUpdateObjectRecords?: boolean;
+ canSoftDeleteObjectRecords?: boolean;
+ canDestroyObjectRecords?: boolean;
+ }>;
+ fieldPermissions: Array<{
+ objectUniversalIdentifier: string;
+ fieldUniversalIdentifier: string;
+ canReadFieldValue?: boolean;
+ canUpdateFieldValue?: boolean;
+ }>;
+ permissionFlags: string[];
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.ts
new file mode 100644
index 00000000000..ae6eabe7882
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util.ts
@@ -0,0 +1,36 @@
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { type DataSource } from 'typeorm';
+
+// Every ApplicationRegistration must be owned by a workspace (ownerWorkspaceId
+// represents ownership / write-access, not visibility scoping — marketplace
+// registrations are readable by all workspaces). When the catalog sync creates
+// registrations for marketplace apps that no developer has explicitly claimed,
+// we assign them to the "admin" workspace: the oldest active workspace whose
+// owner has admin privileges.
+//
+// TODO: This heuristic is fragile — on fresh instances with no admin users the
+// catalog sync is silently skipped, and if the admin workspace is later deleted
+// all marketplace registrations become orphaned. Consider introducing a
+// dedicated "platform" workspace or making ownerWorkspaceId nullable instead.
+export const getAdminWorkspaceId = async (
+ dataSource: DataSource,
+): Promise<string | null> => {
+ const result = await dataSource.query<Array<{ workspaceId: string }>>(
+ `SELECT uw."workspaceId"
+ FROM core."userWorkspace" uw
+ JOIN core."user" u ON u.id = uw."userId" AND u."deletedAt" IS NULL
+ JOIN core."workspace" w ON w.id = uw."workspaceId" AND w."deletedAt" IS NULL
+ WHERE (u."canAccessFullAdminPanel" = true OR u."canImpersonate" = true)
+ AND w."activationStatus" = $1
+ AND uw."deletedAt" IS NULL
+ ORDER BY w."createdAt" ASC
+ LIMIT 1`,
+ [WorkspaceActivationStatus.ACTIVE],
+ );
+
+ if (result.length === 0) {
+ return null;
+ }
+
+ return result[0].workspaceId;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/__tests__/oauth-scopes.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.ts
similarity index 88%
rename from packages/twenty-server/src/engine/core-modules/application-registration/__tests__/oauth-scopes.spec.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.ts
index 2404de358fa..8a7d8de3913 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/__tests__/oauth-scopes.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/oauth-scopes.spec.ts
@@ -2,7 +2,7 @@ import {
ALL_OAUTH_SCOPES,
OAUTH_SCOPE_DESCRIPTIONS,
OAUTH_SCOPES,
-} from 'src/engine/core-modules/application-registration/constants/oauth-scopes';
+} from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';
describe('OAuth Scopes', () => {
it('should have all scopes defined', () => {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-exception-filter.ts
new file mode 100644
index 00000000000..41da4f8278a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-exception-filter.ts
@@ -0,0 +1,30 @@
+import { Catch, ExceptionFilter } from '@nestjs/common';
+
+import {
+ ApplicationRegistrationException,
+ ApplicationRegistrationExceptionCode,
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import {
+ InternalServerError,
+ NotFoundError,
+ UserInputError,
+} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
+@Catch(ApplicationRegistrationException)
+export class ApplicationRegistrationExceptionFilter implements ExceptionFilter {
+ catch(exception: ApplicationRegistrationException) {
+ switch (exception.code) {
+ case ApplicationRegistrationExceptionCode.APPLICATION_REGISTRATION_NOT_FOUND:
+ case ApplicationRegistrationExceptionCode.VARIABLE_NOT_FOUND:
+ throw new NotFoundError(exception);
+ case ApplicationRegistrationExceptionCode.INVALID_INPUT:
+ case ApplicationRegistrationExceptionCode.INVALID_SCOPE:
+ case ApplicationRegistrationExceptionCode.INVALID_REDIRECT_URI:
+ case ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH:
+ case ApplicationRegistrationExceptionCode.UNIVERSAL_IDENTIFIER_ALREADY_CLAIMED:
+ throw new UserInputError(exception);
+ default:
+ throw new InternalServerError(exception);
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.entity.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.entity.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.entity.ts
index 011fadb9188..e99b4ae7814 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.entity.ts
@@ -15,7 +15,7 @@ import {
} from 'typeorm';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
@Entity({ name: 'applicationRegistrationVariable', schema: 'core' })
@ObjectType('ApplicationRegistrationVariable')
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.ts
index ef57ca26624..5eaaa4526ef 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration-variable.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-variable.service.ts
@@ -5,14 +5,14 @@ import { type ServerVariables } from 'twenty-shared/application';
import { isDefined } from 'twenty-shared/utils';
import { In, Not, type Repository } from 'typeorm';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
import {
ApplicationRegistrationException,
ApplicationRegistrationExceptionCode,
-} from 'src/engine/core-modules/application-registration/application-registration.exception';
-import { type CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application-registration/dtos/create-application-registration-variable.input';
-import { type UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application-registration/dtos/update-application-registration-variable.input';
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import { type CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input';
+import { type UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input';
import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';
@Injectable()
@@ -176,7 +176,7 @@ export class ApplicationRegistrationVariableService {
workspaceId: string,
): Promise<void> {
const registration = await this.applicationRegistrationRepository.findOne({
- where: { id: registrationId, workspaceId },
+ where: { id: registrationId, ownerWorkspaceId: workspaceId },
});
if (!registration) {
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts
similarity index 63%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts
index 08cc6e402a9..f438b980138 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts
@@ -2,6 +2,7 @@ import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
+ Check,
Column,
CreateDateColumn,
DeleteDateColumn,
@@ -10,13 +11,17 @@ import {
JoinColumn,
ManyToOne,
OneToMany,
+ OneToOne,
PrimaryGeneratedColumn,
type Relation,
UpdateDateColumn,
} from 'typeorm';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
+import { type MarketplaceDisplayData } from 'src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -39,7 +44,11 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
},
)
@Index('IDX_APPLICATION_REGISTRATION_CREATED_BY_USER_ID', ['createdByUserId'])
-@Index('IDX_APPLICATION_REGISTRATION_WORKSPACE_ID', ['workspaceId'])
+@Index('IDX_APPLICATION_REGISTRATION_WORKSPACE_ID', ['ownerWorkspaceId'])
+@Check(
+ 'CHK_NPM_HAS_SOURCE_PACKAGE',
+ `"sourceType" <> 'npm' OR "sourcePackage" IS NOT NULL`,
+)
export class ApplicationRegistrationEntity {
@IDField(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
@@ -87,13 +96,38 @@ export class ApplicationRegistrationEntity {
@JoinColumn({ name: 'createdByUserId' })
createdByUser: Relation<UserEntity> | null;
- @Column({ nullable: false, type: 'uuid' })
- workspaceId: string;
+ // Represents ownership (who can edit), not visibility scoping.
+ // Marketplace registrations are readable by all workspaces but owned by the
+ // admin workspace when no developer has explicitly claimed them.
+ @Column({ name: 'workspaceId', nullable: false, type: 'uuid' })
+ ownerWorkspaceId: string;
@ManyToOne(() => WorkspaceEntity, { onDelete: 'CASCADE' })
@JoinColumn({ name: 'workspaceId' })
workspace: Relation<WorkspaceEntity>;
+ @Field(() => AppRegistrationSourceType)
+ @Column({
+ type: 'text',
+ default: AppRegistrationSourceType.LOCAL,
+ })
+ sourceType: AppRegistrationSourceType;
+
+ @Field(() => String, { nullable: true })
+ @Column({ nullable: true, type: 'text' })
+ sourcePackage: string | null;
+
+ @Column({ nullable: true, type: 'uuid' })
+ tarballFileId: string | null;
+
+ @OneToOne(() => FileEntity, { onDelete: 'SET NULL', nullable: true })
+ @JoinColumn({ name: 'tarballFileId' })
+ tarballFile: Relation<FileEntity> | null;
+
+ @Field(() => String, { nullable: true })
+ @Column({ nullable: true, type: 'text' })
+ latestAvailableVersion: string | null;
+
@Field(() => String, { nullable: true })
@Column({ nullable: true, type: 'text' })
websiteUrl: string | null;
@@ -102,6 +136,13 @@ export class ApplicationRegistrationEntity {
@Column({ nullable: true, type: 'text' })
termsUrl: string | null;
+ @Field(() => Boolean)
+ @Column({ name: 'isFeatured', type: 'boolean', default: false })
+ isFeatured: boolean;
+
+ @Column({ type: 'jsonb', nullable: true })
+ marketplaceDisplayData: MarketplaceDisplayData | null;
+
@OneToMany(
() => ApplicationRegistrationVariableEntity,
(variable) => variable.applicationRegistration,
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.exception.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.exception.ts
similarity index 83%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration.exception.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.exception.ts
index 75ec648468c..981dc93a3b2 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.exception.ts
@@ -9,6 +9,8 @@ export enum ApplicationRegistrationExceptionCode {
UNIVERSAL_IDENTIFIER_ALREADY_CLAIMED = 'UNIVERSAL_IDENTIFIER_ALREADY_CLAIMED',
INVALID_SCOPE = 'INVALID_SCOPE',
INVALID_REDIRECT_URI = 'INVALID_REDIRECT_URI',
+ INVALID_INPUT = 'INVALID_INPUT',
+ SOURCE_CHANNEL_MISMATCH = 'SOURCE_CHANNEL_MISMATCH',
VARIABLE_NOT_FOUND = 'VARIABLE_NOT_FOUND',
}
@@ -24,6 +26,10 @@ const getExceptionUserFriendlyMessage = (
return msg`One or more requested scopes are invalid.`;
case ApplicationRegistrationExceptionCode.INVALID_REDIRECT_URI:
return msg`One or more redirect URIs are invalid.`;
+ case ApplicationRegistrationExceptionCode.INVALID_INPUT:
+ return msg`Invalid input for application registration.`;
+ case ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH:
+ return msg`The app source channel does not match the expected type.`;
case ApplicationRegistrationExceptionCode.VARIABLE_NOT_FOUND:
return msg`Application registration variable not found.`;
default:
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts
similarity index 60%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration.module.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts
index 885ebc85df1..9fd867815bb 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts
@@ -1,22 +1,27 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity';
-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application-registration/application-registration-variable.service';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
-import { ApplicationRegistrationResolver } from 'src/engine/core-modules/application-registration/application-registration.resolver';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
-import { OAuthDiscoveryController } from 'src/engine/core-modules/application-registration/controllers/oauth-discovery.controller';
-import { OAuthTokenController } from 'src/engine/core-modules/application-registration/controllers/oauth-token.controller';
-import { OAuthService } from 'src/engine/core-modules/application-registration/oauth.service';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationRegistrationResolver } from 'src/engine/core-modules/application/application-registration/application-registration.resolver';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+import { OAuthDiscoveryController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller';
+import { OAuthTokenController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-token.controller';
+import { OAuthService } from 'src/engine/core-modules/application/application-registration/oauth.service';
+import { AppTarballUploadService } from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';
import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
@Module({
imports: [
@@ -28,16 +33,21 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
UserWorkspaceEntity,
]),
SecretEncryptionModule,
+ FeatureFlagModule,
PermissionsModule,
ThrottlerModule,
TokenModule,
ApplicationModule,
+ ApplicationInstallModule,
+ FileStorageModule,
+ WorkspaceCacheStorageModule,
],
controllers: [OAuthTokenController, OAuthDiscoveryController],
providers: [
ApplicationRegistrationService,
ApplicationRegistrationVariableService,
ApplicationRegistrationResolver,
+ AppTarballUploadService,
OAuthService,
],
exports: [
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
similarity index 66%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration.resolver.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
index e9b9c69fa2d..590a249225f 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
@@ -1,20 +1,33 @@
import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
import { PermissionFlagType } from 'twenty-shared/constants';
+import { FeatureFlagKey } from 'twenty-shared/types';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity';
-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application-registration/application-registration-variable.service';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
-import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application-registration/dtos/application-registration-stats.dto';
-import { CreateApplicationRegistrationInput } from 'src/engine/core-modules/application-registration/dtos/create-application-registration.input';
-import { CreateApplicationRegistrationDTO } from 'src/engine/core-modules/application-registration/dtos/create-application-registration.dto';
-import { PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application-registration/dtos/public-application-registration.dto';
-import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application-registration/dtos/create-application-registration-variable.input';
-import { RotateClientSecretDTO } from 'src/engine/core-modules/application-registration/dtos/rotate-client-secret.dto';
-import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application-registration/dtos/update-application-registration.input';
-import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application-registration/dtos/update-application-registration-variable.input';
+import type { FileUpload } from 'graphql-upload/processRequest.mjs';
+
+import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+import {
+ AppTarballUploadService,
+ MAX_TARBALL_UPLOAD_SIZE_BYTES,
+} from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';
+import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';
+import { CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';
+import { CreateApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto';
+import { PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';
+import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input';
+import { RotateClientSecretDTO } from 'src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto';
+import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';
+import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input';
+import {
+ ApplicationRegistrationException,
+ ApplicationRegistrationExceptionCode,
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
@@ -23,14 +36,20 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import {
+ FeatureFlagGuard,
+ RequireFeatureFlag,
+} from 'src/engine/guards/feature-flag.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
@UseFilters(
+ ApplicationRegistrationExceptionFilter,
AuthGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
)
@@ -38,6 +57,7 @@ export class ApplicationRegistrationResolver {
constructor(
private readonly applicationRegistrationService: ApplicationRegistrationService,
private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,
+ private readonly appTarballUploadService: AppTarballUploadService,
) {}
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
@@ -48,7 +68,8 @@ export class ApplicationRegistrationResolver {
return this.applicationRegistrationService.findPublicByClientId(clientId);
}
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(WorkspaceAuthGuard, FeatureFlagGuard, NoPermissionGuard)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Query(() => ApplicationRegistrationEntity, { nullable: true })
async findApplicationRegistrationByUniversalIdentifier(
@Args('universalIdentifier') universalIdentifier: string,
@@ -60,8 +81,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Query(() => [ApplicationRegistrationEntity])
async findManyApplicationRegistrations(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -71,8 +94,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Query(() => ApplicationRegistrationEntity)
async findOneApplicationRegistration(
@Args('id') id: string,
@@ -83,8 +108,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Query(() => ApplicationRegistrationStatsDTO)
async findApplicationRegistrationStats(
@Args('id') id: string,
@@ -95,8 +122,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => CreateApplicationRegistrationDTO)
async createApplicationRegistration(
@Args('input') input: CreateApplicationRegistrationInput,
@@ -112,8 +141,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => ApplicationRegistrationEntity)
async updateApplicationRegistration(
@Args('input') input: UpdateApplicationRegistrationInput,
@@ -124,8 +155,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => Boolean)
async deleteApplicationRegistration(
@Args('id') id: string,
@@ -136,8 +169,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => RotateClientSecretDTO)
async rotateApplicationRegistrationClientSecret(
@Args('id') id: string,
@@ -154,8 +189,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Query(() => [ApplicationRegistrationVariableEntity])
async findApplicationRegistrationVariables(
@Args('applicationRegistrationId') applicationRegistrationId: string,
@@ -169,8 +206,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => ApplicationRegistrationVariableEntity)
async createApplicationRegistrationVariable(
@Args('input') input: CreateApplicationRegistrationVariableInput,
@@ -184,8 +223,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => ApplicationRegistrationVariableEntity)
async updateApplicationRegistrationVariable(
@Args('input') input: UpdateApplicationRegistrationVariableInput,
@@ -199,8 +240,10 @@ export class ApplicationRegistrationResolver {
@UseGuards(
WorkspaceAuthGuard,
+ FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@Mutation(() => Boolean)
async deleteApplicationRegistrationVariable(
@Args('id') id: string,
@@ -211,4 +254,35 @@ export class ApplicationRegistrationResolver {
workspaceId,
);
}
+
+ @UseGuards(
+ WorkspaceAuthGuard,
+ FeatureFlagGuard,
+ SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS),
+ )
+ @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+ @Mutation(() => ApplicationRegistrationEntity)
+ async uploadAppTarball(
+ @Args({ name: 'file', type: () => GraphQLUpload })
+ { createReadStream }: FileUpload,
+ @Args('universalIdentifier', { type: () => String, nullable: true })
+ universalIdentifier: string | undefined,
+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
+ ): Promise<ApplicationRegistrationEntity> {
+ const stream = createReadStream();
+ const tarballBuffer = await streamToBuffer(stream);
+
+ if (tarballBuffer.length > MAX_TARBALL_UPLOAD_SIZE_BYTES) {
+ throw new ApplicationRegistrationException(
+ `Tarball exceeds maximum size of ${MAX_TARBALL_UPLOAD_SIZE_BYTES} bytes`,
+ ApplicationRegistrationExceptionCode.INVALID_INPUT,
+ );
+ }
+
+ return this.appTarballUploadService.uploadTarball({
+ tarballBuffer,
+ universalIdentifier,
+ ownerWorkspaceId: workspaceId,
+ });
+ }
}
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
similarity index 86%
rename from packages/twenty-server/src/engine/core-modules/application-registration/application-registration.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
index 4fed82ea76f..10102b489a3 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/application-registration.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
@@ -8,16 +8,16 @@ import { isDefined } from 'twenty-shared/utils';
import { type Repository } from 'typeorm';
import { v4 } from 'uuid';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
import {
ApplicationRegistrationException,
ApplicationRegistrationExceptionCode,
-} from 'src/engine/core-modules/application-registration/application-registration.exception';
-import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application-registration/constants/oauth-scopes';
-import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application-registration/dtos/application-registration-stats.dto';
-import { type CreateApplicationRegistrationInput } from 'src/engine/core-modules/application-registration/dtos/create-application-registration.input';
-import { type PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application-registration/dtos/public-application-registration.dto';
-import { type UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application-registration/dtos/update-application-registration.input';
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';
+import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';
+import { type CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';
+import { type PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';
+import { type UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { validateRedirectUri } from 'src/engine/core-modules/auth/utils/validate-redirect-uri.util';
@@ -33,20 +33,20 @@ export class ApplicationRegistrationService {
) {}
async findMany(
- workspaceId: string,
+ ownerWorkspaceId: string,
): Promise<ApplicationRegistrationEntity[]> {
return this.applicationRegistrationRepository.find({
- where: { workspaceId },
+ where: { ownerWorkspaceId },
order: { createdAt: 'DESC' },
});
}
async findOneById(
id: string,
- workspaceId: string,
+ ownerWorkspaceId: string,
): Promise<ApplicationRegistrationEntity> {
const registration = await this.applicationRegistrationRepository.findOne({
- where: { id, workspaceId },
+ where: { id, ownerWorkspaceId },
});
if (!registration) {
@@ -93,10 +93,10 @@ export class ApplicationRegistrationService {
async isOwnedByWorkspace(id: string, workspaceId: string): Promise<boolean> {
const registration = await this.applicationRegistrationRepository.findOne({
where: { id },
- select: ['id', 'workspaceId'],
+ select: ['id', 'ownerWorkspaceId'],
});
- return registration?.workspaceId === workspaceId;
+ return registration?.ownerWorkspaceId === workspaceId;
}
// Global lookup — used by app sync to find existing registrations
@@ -110,7 +110,7 @@ export class ApplicationRegistrationService {
async create(
input: CreateApplicationRegistrationInput,
- workspaceId: string,
+ ownerWorkspaceId: string,
createdByUserId: string | null,
): Promise<{
applicationRegistration: ApplicationRegistrationEntity;
@@ -152,7 +152,7 @@ export class ApplicationRegistrationService {
oAuthRedirectUris: input.oAuthRedirectUris ?? [],
oAuthScopes: input.oAuthScopes ?? [],
createdByUserId,
- workspaceId,
+ ownerWorkspaceId,
websiteUrl: input.websiteUrl ?? null,
termsUrl: input.termsUrl ?? null,
});
@@ -166,11 +166,11 @@ export class ApplicationRegistrationService {
async update(
input: UpdateApplicationRegistrationInput,
- workspaceId: string,
+ ownerWorkspaceId: string,
): Promise<ApplicationRegistrationEntity> {
const { id, update } = input;
- await this.findOneById(id, workspaceId);
+ await this.findOneById(id, ownerWorkspaceId);
if (isDefined(update.oAuthRedirectUris)) {
this.validateRedirectUris(update.oAuthRedirectUris);
@@ -198,18 +198,21 @@ export class ApplicationRegistrationService {
await this.applicationRegistrationRepository.update(id, updateData);
}
- return this.findOneById(id, workspaceId);
+ return this.findOneById(id, ownerWorkspaceId);
}
- async delete(id: string, workspaceId: string): Promise<boolean> {
- await this.findOneById(id, workspaceId);
+ async delete(id: string, ownerWorkspaceId: string): Promise<boolean> {
+ await this.findOneById(id, ownerWorkspaceId);
await this.applicationRegistrationRepository.softDelete(id);
return true;
}
- async rotateClientSecret(id: string, workspaceId: string): Promise<string> {
- await this.findOneById(id, workspaceId);
+ async rotateClientSecret(
+ id: string,
+ ownerWorkspaceId: string,
+ ): Promise<string> {
+ await this.findOneById(id, ownerWorkspaceId);
const { clientSecret, clientSecretHash } =
await this.generateClientSecret();
@@ -234,9 +237,9 @@ export class ApplicationRegistrationService {
async getStats(
applicationRegistrationId: string,
- workspaceId: string,
+ ownerWorkspaceId: string,
): Promise<ApplicationRegistrationStatsDTO> {
- await this.findOneById(applicationRegistrationId, workspaceId);
+ await this.findOneById(applicationRegistrationId, ownerWorkspaceId);
const versionDistribution: { version: string; count: number }[] =
await this.applicationRepository
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/constants/oauth-scopes.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/constants/oauth-scopes.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/constants/oauth-scopes.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/constants/oauth-scopes.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-discovery.controller.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-discovery.controller.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.ts
index c58252ce2cb..e5855d1471b 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-discovery.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller.ts
@@ -1,6 +1,6 @@
import { Controller, Get, UseGuards } from '@nestjs/common';
-import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application-registration/constants/oauth-scopes';
+import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-registration/constants/oauth-scopes';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-token.controller.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-token.controller.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.ts
index 4b7a588f335..b175c9a2232 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/controllers/oauth-token.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/controllers/oauth-token.controller.ts
@@ -13,12 +13,12 @@ import {
import { type Request, type Response } from 'express';
-import { OAuthIntrospectInput } from 'src/engine/core-modules/application-registration/dtos/oauth-introspect.input';
-import { OAuthRevokeInput } from 'src/engine/core-modules/application-registration/dtos/oauth-revoke.input';
-import { OAuthTokenInput } from 'src/engine/core-modules/application-registration/dtos/oauth-token.input';
-import { OAuthService } from 'src/engine/core-modules/application-registration/oauth.service';
-import { OAuthErrorResponse } from 'src/engine/core-modules/application-registration/types/oauth-error-response.type';
-import { OAuthTokenResponse } from 'src/engine/core-modules/application-registration/types/oauth-token-response.type';
+import { OAuthIntrospectInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input';
+import { OAuthRevokeInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input';
+import { OAuthTokenInput } from 'src/engine/core-modules/application/application-registration/dtos/oauth-token.input';
+import { OAuthService } from 'src/engine/core-modules/application/application-registration/oauth.service';
+import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-error-response.type';
+import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-token-response.type';
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';
import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.service';
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/application-registration-stats.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/application-registration-stats.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration-variable.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto.ts
similarity index 81%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto.ts
index 92ce053b1ab..6421572c4f0 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration.dto.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto.ts
@@ -1,6 +1,6 @@
import { Field, ObjectType } from '@nestjs/graphql';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
@ObjectType('CreateApplicationRegistration')
export class CreateApplicationRegistrationDTO {
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/create-application-registration.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/create-application-registration.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-introspect.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-introspect.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-introspect.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-revoke.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-revoke.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-revoke.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-token.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-token.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/oauth-token.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/oauth-token.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/public-application-registration.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/public-application-registration.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/rotate-client-secret.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/rotate-client-secret.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/update-application-registration-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/update-application-registration-variable.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/dtos/update-application-registration.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/dtos/update-application-registration.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.ts
new file mode 100644
index 00000000000..ab88a4b37ac
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum.ts
@@ -0,0 +1,11 @@
+import { registerEnumType } from '@nestjs/graphql';
+
+export enum AppRegistrationSourceType {
+ NPM = 'npm',
+ TARBALL = 'tarball',
+ LOCAL = 'local',
+}
+
+registerEnumType(AppRegistrationSourceType, {
+ name: 'AppRegistrationSourceType',
+});
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/oauth.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.ts
similarity index 92%
rename from packages/twenty-server/src/engine/core-modules/application-registration/oauth.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.ts
index 41dd2aad34b..f08f307baf1 100644
--- a/packages/twenty-server/src/engine/core-modules/application-registration/oauth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/oauth.service.ts
@@ -11,12 +11,14 @@ import {
AppTokenEntity,
AppTokenType,
} from 'src/engine/core-modules/app-token/app-token.entity';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
-import { OAuthErrorResponse } from 'src/engine/core-modules/application-registration/types/oauth-error-response.type';
-import { OAuthTokenResponse } from 'src/engine/core-modules/application-registration/types/oauth-token-response.type';
+import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { OAuthErrorResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-error-response.type';
+import { OAuthTokenResponse } from 'src/engine/core-modules/application/application-registration/types/oauth-token-response.type';
import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
@@ -35,6 +37,7 @@ export class OAuthService {
private readonly applicationTokenService: ApplicationTokenService,
private readonly applicationRegistrationService: ApplicationRegistrationService,
private readonly applicationService: ApplicationService,
+ private readonly applicationInstallService: ApplicationInstallService,
private readonly twentyConfigService: TwentyConfigService,
) {}
@@ -558,7 +561,31 @@ export class OAuthService {
`Auto-installing application "${applicationRegistration.name}" in workspace ${workspaceId}`,
);
- // TODO: defaulting to version 0.0.0, build better system
+ if (
+ applicationRegistration.sourceType === AppRegistrationSourceType.NPM ||
+ applicationRegistration.sourceType === AppRegistrationSourceType.TARBALL
+ ) {
+ await this.applicationInstallService.installApplication({
+ appRegistrationId: applicationRegistration.id,
+ workspaceId,
+ });
+
+ const installedApplication = await this.applicationRepository.findOne({
+ where: {
+ applicationRegistrationId: applicationRegistration.id,
+ workspaceId,
+ },
+ });
+
+ if (installedApplication) {
+ return installedApplication;
+ }
+
+ this.logger.warn(
+ `Install succeeded but application not found in workspace, falling back to bare creation`,
+ );
+ }
+
return this.applicationService.create({
universalIdentifier: applicationRegistration.universalIdentifier,
name: applicationRegistration.name,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.ts
new file mode 100644
index 00000000000..d2bb46e869d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/services/app-tarball-upload.service.ts
@@ -0,0 +1,137 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { promises as fs } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import {
+ ApplicationRegistrationException,
+ ApplicationRegistrationExceptionCode,
+} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
+import { extractTarballSecurely } from 'src/engine/core-modules/application/utils/extract-tarball-securely.util';
+import { resolvePackageContentDir } from 'src/engine/core-modules/application/utils/tarball-utils';
+import { readJsonFile } from 'src/engine/core-modules/application/utils/read-json-file.util';
+import { FileStorageDriverFactory } from 'src/engine/core-modules/file-storage/file-storage-driver.factory';
+
+export const MAX_TARBALL_UPLOAD_SIZE_BYTES = 50 * 1024 * 1024;
+
+@Injectable()
+export class AppTarballUploadService {
+ private readonly logger = new Logger(AppTarballUploadService.name);
+
+ constructor(
+ @InjectRepository(ApplicationRegistrationEntity)
+ private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
+ private readonly fileStorageDriverFactory: FileStorageDriverFactory,
+ ) {}
+
+ async uploadTarball(params: {
+ tarballBuffer: Buffer;
+ universalIdentifier?: string;
+ ownerWorkspaceId: string;
+ }): Promise<ApplicationRegistrationEntity> {
+ const tempDir = join(tmpdir(), 'twenty-tarball-upload', v4());
+
+ await fs.mkdir(tempDir, { recursive: true });
+
+ try {
+ const tarballPath = join(tempDir, 'app.tar.gz');
+
+ await fs.writeFile(tarballPath, params.tarballBuffer);
+
+ const extractDir = join(tempDir, 'extracted');
+
+ await fs.mkdir(extractDir, { recursive: true });
+ await extractTarballSecurely(tarballPath, extractDir);
+
+ const contentDir = await resolvePackageContentDir(extractDir);
+
+ const manifest = await readJsonFile<{
+ application?: {
+ universalIdentifier?: string;
+ displayName?: string;
+ };
+ }>(contentDir, 'manifest.json');
+
+ if (manifest === null) {
+ throw new ApplicationRegistrationException(
+ 'manifest.json not found or invalid in tarball',
+ ApplicationRegistrationExceptionCode.INVALID_INPUT,
+ );
+ }
+
+ const universalIdentifier =
+ params.universalIdentifier ?? manifest.application?.universalIdentifier;
+
+ if (!isDefined(universalIdentifier)) {
+ throw new ApplicationRegistrationException(
+ 'universalIdentifier is required (in body or manifest)',
+ ApplicationRegistrationExceptionCode.INVALID_INPUT,
+ );
+ }
+
+ let appRegistration = await this.appRegistrationRepository.findOne({
+ where: {
+ universalIdentifier,
+ ownerWorkspaceId: params.ownerWorkspaceId,
+ },
+ });
+
+ if (isDefined(appRegistration)) {
+ if (
+ appRegistration.sourceType !== AppRegistrationSourceType.LOCAL &&
+ appRegistration.sourceType !== AppRegistrationSourceType.TARBALL
+ ) {
+ throw new ApplicationRegistrationException(
+ `This app is registered as ${appRegistration.sourceType}. Cannot upload tarball.`,
+ ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH,
+ );
+ }
+ } else {
+ appRegistration = this.appRegistrationRepository.create({
+ universalIdentifier,
+ name: manifest.application?.displayName ?? 'Unknown App',
+ sourceType: AppRegistrationSourceType.TARBALL,
+ oAuthClientId: v4(),
+ oAuthRedirectUris: [],
+ oAuthScopes: [],
+ ownerWorkspaceId: params.ownerWorkspaceId,
+ });
+
+ appRegistration =
+ await this.appRegistrationRepository.save(appRegistration);
+ }
+
+ const storagePath = join('app-tarball', appRegistration.id);
+
+ const driver = this.fileStorageDriverFactory.getCurrentDriver();
+
+ await driver.writeFile({
+ filePath: join(storagePath, 'app.tar.gz'),
+ sourceFile: params.tarballBuffer,
+ mimeType: 'application/gzip',
+ });
+
+ await this.appRegistrationRepository.update(appRegistration.id, {
+ sourceType: AppRegistrationSourceType.TARBALL,
+ });
+
+ this.logger.log(
+ `Tarball uploaded for app ${universalIdentifier} (registration ${appRegistration.id})`,
+ );
+
+ return this.appRegistrationRepository.findOneOrFail({
+ where: { id: appRegistration.id },
+ });
+ } finally {
+ await fs.rm(tempDir, { recursive: true, force: true });
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/types/oauth-error-response.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-error-response.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/types/oauth-error-response.type.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-error-response.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/application-registration/types/oauth-token-response.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-token-response.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application-registration/types/oauth-token-response.type.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-registration/types/oauth-token-response.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/__tests__/application-variable.service.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/__tests__/application-variable.service.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/__tests__/application-variable.service.spec.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/__tests__/application-variable.service.spec.ts
index 4a370707a4c..017ab70aaae 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/__tests__/application-variable.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/__tests__/application-variable.service.spec.ts
@@ -3,13 +3,13 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { type Repository } from 'typeorm';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import {
ApplicationVariableEntityException,
ApplicationVariableEntityExceptionCode,
-} from 'src/engine/core-modules/applicationVariable/application-variable.exception';
-import { ApplicationVariableEntityService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
-import { SECRET_APPLICATION_VARIABLE_MASK } from 'src/engine/core-modules/applicationVariable/constants/secret-application-variable-mask.constant';
+} from 'src/engine/core-modules/application/application-variable/application-variable.exception';
+import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';
+import { SECRET_APPLICATION_VARIABLE_MASK } from 'src/engine/core-modules/application/application-variable/constants/secret-application-variable-mask.constant';
import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable-exception-filter.ts
similarity index 87%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable-exception-filter.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable-exception-filter.ts
index 4d52e37850f..85fc7b63bd6 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable-exception-filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable-exception-filter.ts
@@ -5,7 +5,7 @@ import { assertUnreachable } from 'twenty-shared/utils';
import {
ApplicationVariableEntityException,
ApplicationVariableEntityExceptionCode,
-} from 'src/engine/core-modules/applicationVariable/application-variable.exception';
+} from 'src/engine/core-modules/application/application-variable/application-variable.exception';
import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
@Catch(ApplicationVariableEntityException)
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.entity.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.entity.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.entity.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.exception.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.exception.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.exception.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.exception.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts
similarity index 79%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.module.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts
index 5c0248b4a13..1057e6de543 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts
@@ -3,10 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
-import { ApplicationVariableEntityResolver } from 'src/engine/core-modules/applicationVariable/application-variable.resolver';
-import { ApplicationVariableEntityService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
-import { WorkspaceApplicationVariableMapCacheService } from 'src/engine/core-modules/applicationVariable/services/workspace-application-variable-map-cache.service';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
+import { ApplicationVariableEntityResolver } from 'src/engine/core-modules/application/application-variable/application-variable.resolver';
+import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';
+import { WorkspaceApplicationVariableMapCacheService } from 'src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service';
import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
similarity index 82%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.resolver.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
index 01f9b871405..086f3ef25c1 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
@@ -3,11 +3,11 @@ import { Args, Mutation, Parent, ResolveField } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
-import { ApplicationVariableEntityExceptionFilter } from 'src/engine/core-modules/applicationVariable/application-variable-exception-filter';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
-import { ApplicationVariableEntityService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
-import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/applicationVariable/dtos/application-variable.dto';
-import { UpdateApplicationVariableEntityInput } from 'src/engine/core-modules/applicationVariable/dtos/update-application-variable.input';
+import { ApplicationVariableEntityExceptionFilter } from 'src/engine/core-modules/application/application-variable/application-variable-exception-filter';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
+import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';
+import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/application/application-variable/dtos/application-variable.dto';
+import { UpdateApplicationVariableEntityInput } from 'src/engine/core-modules/application/application-variable/dtos/update-application-variable.input';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.service.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.service.ts
index 400d482bc55..b938ab1354e 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/application-variable.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.service.ts
@@ -5,12 +5,12 @@ import { ApplicationVariables } from 'twenty-shared/application';
import { isDefined } from 'twenty-shared/utils';
import { In, Not, Repository } from 'typeorm';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import {
ApplicationVariableEntityException,
ApplicationVariableEntityExceptionCode,
-} from 'src/engine/core-modules/applicationVariable/application-variable.exception';
-import { SECRET_APPLICATION_VARIABLE_MASK } from 'src/engine/core-modules/applicationVariable/constants/secret-application-variable-mask.constant';
+} from 'src/engine/core-modules/application/application-variable/application-variable.exception';
+import { SECRET_APPLICATION_VARIABLE_MASK } from 'src/engine/core-modules/application/application-variable/constants/secret-application-variable-mask.constant';
import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/constants/secret-application-variable-mask.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/constants/secret-application-variable-mask.constant.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/constants/secret-application-variable-mask.constant.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/constants/secret-application-variable-mask.constant.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/dtos/application-variable.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/dtos/application-variable.dto.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/dtos/application-variable.dto.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/dtos/application-variable.dto.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/dtos/update-application-variable.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/dtos/update-application-variable.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/dtos/update-application-variable.input.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/dtos/update-application-variable.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/services/workspace-application-variable-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service.ts
similarity index 88%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/services/workspace-application-variable-map-cache.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service.ts
index 0e84bbb9d9e..f14d35f7eb3 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/services/workspace-application-variable-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/services/workspace-application-variable-map-cache.service.ts
@@ -6,9 +6,9 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
-import { type ApplicationVariableCacheMaps } from 'src/engine/core-modules/applicationVariable/types/application-variable-cache-maps.type';
-import { fromApplicationVariableEntityToFlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/utils/from-application-variable-entity-to-flat-application-variable.util';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
+import { type ApplicationVariableCacheMaps } from 'src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type';
+import { fromApplicationVariableEntityToFlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/utils/from-application-variable-entity-to-flat-application-variable.util';
import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
@Injectable()
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/types/application-variable-cache-maps.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type.ts
similarity index 75%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/types/application-variable-cache-maps.type.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type.ts
index 0a25616135c..2f193f98adc 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/types/application-variable-cache-maps.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type.ts
@@ -1,4 +1,4 @@
-import { type FlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/types/flat-application-variable.type';
+import { type FlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/types/flat-application-variable.type';
export type ApplicationVariableCacheMaps = {
byId: Partial<Record<string, FlatApplicationVariable>>;
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/types/flat-application-variable.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/types/flat-application-variable.type.ts
similarity index 78%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/types/flat-application-variable.type.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/types/flat-application-variable.type.ts
index 619273f7f07..7fc67618f62 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/types/flat-application-variable.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/types/flat-application-variable.type.ts
@@ -1,4 +1,4 @@
-import { type ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
+import { type ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';
export type FlatApplicationVariable = FlatEntityFrom<ApplicationVariableEntity>;
diff --git a/packages/twenty-server/src/engine/core-modules/applicationVariable/utils/from-application-variable-entity-to-flat-application-variable.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/utils/from-application-variable-entity-to-flat-application-variable.util.ts
similarity index 77%
rename from packages/twenty-server/src/engine/core-modules/applicationVariable/utils/from-application-variable-entity-to-flat-application-variable.util.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-variable/utils/from-application-variable-entity-to-flat-application-variable.util.ts
index ca37dacc646..cae76b726bd 100644
--- a/packages/twenty-server/src/engine/core-modules/applicationVariable/utils/from-application-variable-entity-to-flat-application-variable.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/utils/from-application-variable-entity-to-flat-application-variable.util.ts
@@ -1,5 +1,5 @@
-import { type ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
-import { type FlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/types/flat-application-variable.type';
+import { type ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
+import { type FlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/types/flat-application-variable.type';
export const fromApplicationVariableEntityToFlatApplicationVariable = (
entity: ApplicationVariableEntity,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.ts
new file mode 100644
index 00000000000..78f72ed5249
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-version-check/application-version-check.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';
+import { AppVersionCheckCronJob } from 'src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job';
+
+@Module({
+ imports: [ApplicationInstallModule],
+ providers: [AppVersionCheckCronJob, AppVersionCheckCronCommand],
+ exports: [AppVersionCheckCronCommand],
+})
+export class AppVersionCheckModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.ts
new file mode 100644
index 00000000000..abcef3ab5e7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job.ts
@@ -0,0 +1,35 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
+import { APP_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant';
+import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+
+@Injectable()
+@Processor(MessageQueue.cronQueue)
+export class AppVersionCheckCronJob {
+ private readonly logger = new Logger(AppVersionCheckCronJob.name);
+
+ constructor(private readonly appUpgradeService: AppUpgradeService) {}
+
+ @Process(AppVersionCheckCronJob.name)
+ @SentryCronMonitor(
+ AppVersionCheckCronJob.name,
+ APP_VERSION_CHECK_CRON_PATTERN,
+ )
+ async handle(): Promise<void> {
+ this.logger.log('Starting app version check...');
+
+ try {
+ await this.appUpgradeService.checkAllForUpdates();
+ this.logger.log('App version check completed successfully');
+ } catch (error) {
+ this.logger.error(
+ `App version check failed: ${error instanceof Error ? error.message : String(error)}`,
+ );
+ throw error;
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.ts
new file mode 100644
index 00000000000..1ceb4b21e8e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command.ts
@@ -0,0 +1,33 @@
+import { Command, CommandRunner } from 'nest-commander';
+
+import { APP_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant';
+import { AppVersionCheckCronJob } from 'src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+
+@Command({
+ name: 'cron:app-version-check',
+ description:
+ 'Starts a cron job to check for app version updates on npm registries',
+})
+export class AppVersionCheckCronCommand extends CommandRunner {
+ constructor(
+ @InjectMessageQueue(MessageQueue.cronQueue)
+ private readonly messageQueueService: MessageQueueService,
+ ) {
+ super();
+ }
+
+ async run(): Promise<void> {
+ await this.messageQueueService.addCron<undefined>({
+ jobName: AppVersionCheckCronJob.name,
+ data: undefined,
+ options: {
+ repeat: {
+ pattern: APP_VERSION_CHECK_CRON_PATTERN,
+ },
+ },
+ });
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.ts
new file mode 100644
index 00000000000..7d3be1e2aed
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-version-check/crons/constants/app-version-check-cron-pattern.constant.ts
@@ -0,0 +1,2 @@
+// Every 6 hours
+export const APP_VERSION_CHECK_CRON_PATTERN = '0 */6 * * *';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
index 9f1057f91f5..2cd01581e8d 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
@@ -15,9 +15,10 @@ import {
UpdateDateColumn,
} from 'typeorm';
-import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application-registration/application-registration.entity';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
+import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
@@ -52,8 +53,8 @@ export class ApplicationEntity extends WorkspaceRelatedEntity {
@Column({ nullable: true, type: 'text' })
version: string | null;
- @Column({ type: 'text', default: 'local' })
- sourceType: 'local';
+ @Column({ type: 'text', default: AppRegistrationSourceType.LOCAL })
+ sourceType: AppRegistrationSourceType;
@Column({ nullable: false, type: 'text' })
sourcePath: string;
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.exception.ts b/packages/twenty-server/src/engine/core-modules/application/application.exception.ts
index 68ce429a70c..ed88cbd77d9 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.exception.ts
@@ -13,6 +13,10 @@ export enum ApplicationExceptionCode {
APPLICATION_NOT_FOUND = 'APPLICATION_NOT_FOUND',
FORBIDDEN = 'FORBIDDEN',
INVALID_INPUT = 'INVALID_INPUT',
+ SOURCE_CHANNEL_MISMATCH = 'SOURCE_CHANNEL_MISMATCH',
+ PACKAGE_RESOLUTION_FAILED = 'PACKAGE_RESOLUTION_FAILED',
+ TARBALL_EXTRACTION_FAILED = 'TARBALL_EXTRACTION_FAILED',
+ UPGRADE_FAILED = 'UPGRADE_FAILED',
}
const getApplicationExceptionUserFriendlyMessage = (
@@ -35,6 +39,14 @@ const getApplicationExceptionUserFriendlyMessage = (
return msg`You do not have permission to perform this action.`;
case ApplicationExceptionCode.INVALID_INPUT:
return msg`Invalid input provided.`;
+ case ApplicationExceptionCode.SOURCE_CHANNEL_MISMATCH:
+ return msg`Source channel mismatch.`;
+ case ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED:
+ return msg`Unable to retrieve the application package.`;
+ case ApplicationExceptionCode.TARBALL_EXTRACTION_FAILED:
+ return msg`Failed to extract tarball.`;
+ case ApplicationExceptionCode.UPGRADE_FAILED:
+ return msg`Application upgrade failed.`;
default:
assertUnreachable(code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.module.ts b/packages/twenty-server/src/engine/core-modules/application/application.module.ts
index 027efeba7d7..d938caefd86 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.module.ts
@@ -2,9 +2,9 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
-import { MarketplaceService } from 'src/engine/core-modules/application/services/marketplace.service';
-import { WorkspaceFlatApplicationMapCacheService } from 'src/engine/core-modules/application/services/workspace-flat-application-map-cache.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { WorkspaceFlatApplicationMapCacheService } from 'src/engine/core-modules/application/workspace-flat-application-map-cache.service';
+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
@@ -15,16 +15,9 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
TypeOrmModule.forFeature([ApplicationEntity, AgentEntity, WorkspaceEntity]),
WorkspaceManyOrAllFlatEntityMapsCacheModule,
WorkspaceCacheModule,
+ TwentyConfigModule,
],
- exports: [
- ApplicationService,
- WorkspaceFlatApplicationMapCacheService,
- MarketplaceService,
- ],
- providers: [
- ApplicationService,
- WorkspaceFlatApplicationMapCacheService,
- MarketplaceService,
- ],
+ exports: [ApplicationService, WorkspaceFlatApplicationMapCacheService],
+ providers: [ApplicationService, WorkspaceFlatApplicationMapCacheService],
})
export class ApplicationModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts b/packages/twenty-server/src/engine/core-modules/application/application.service.ts
similarity index 92%
rename from packages/twenty-server/src/engine/core-modules/application/services/application.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/application.service.ts
index 65cfd5c0dec..8c265e945c8 100644
--- a/packages/twenty-server/src/engine/core-modules/application/services/application.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.service.ts
@@ -126,6 +126,7 @@ export class ApplicationService {
'applicationVariables',
'packageJsonFile',
'yarnLockFile',
+ 'applicationRegistration',
],
});
}
@@ -160,6 +161,7 @@ export class ApplicationService {
'applicationVariables',
'packageJsonFile',
'yarnLockFile',
+ 'applicationRegistration',
],
});
}
@@ -236,10 +238,21 @@ export class ApplicationService {
workspace,
});
- return {
- application: twentyStandardFlatApplication as ApplicationEntity,
- workspace,
- };
+ const application = await this.applicationRepository.findOne({
+ where: {
+ id: twentyStandardFlatApplication.id,
+ workspaceId: workspace.id,
+ },
+ });
+
+ if (!isDefined(application)) {
+ throw new ApplicationException(
+ `Twenty standard application not found for workspace ${workspace.id}`,
+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,
+ );
+ }
+
+ return { application, workspace };
}
async createTwentyStandardApplication(
@@ -395,10 +408,7 @@ export class ApplicationService {
data: Partial<ApplicationEntity> & { workspaceId: string },
queryRunner?: QueryRunner,
): Promise<ApplicationEntity> {
- const application = this.applicationRepository.create({
- ...data,
- sourceType: 'local',
- });
+ const application = this.applicationRepository.create(data);
if (queryRunner) {
return queryRunner.manager.save(ApplicationEntity, application);
@@ -415,19 +425,23 @@ export class ApplicationService {
async update(
id: string,
- data: Parameters<typeof this.applicationRepository.update>[1],
+ data: Parameters<typeof this.applicationRepository.update>[1] & {
+ workspaceId: string;
+ },
): Promise<ApplicationEntity> {
await this.applicationRepository.update({ id }, data);
- await this.workspaceCacheService.invalidateAndRecompute(
- data.workspaceId as string,
- ['flatApplicationMaps'],
- );
+ await this.workspaceCacheService.invalidateAndRecompute(data.workspaceId, [
+ 'flatApplicationMaps',
+ ]);
const updatedApplication = await this.findById(id);
- if (!updatedApplication) {
- throw new Error(`Failed to update application with id ${id}`);
+ if (!isDefined(updatedApplication)) {
+ throw new ApplicationException(
+ `Application with id ${id} not found after update`,
+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,
+ );
}
return updatedApplication;
@@ -440,7 +454,10 @@ export class ApplicationService {
});
if (!isDefined(application)) {
- throw new Error(`Application does not exist`);
+ throw new ApplicationException(
+ `Application with universalIdentifier ${universalIdentifier} not found`,
+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,
+ );
}
await this.fileStorageService.deleteApplicationFiles({
diff --git a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.yml b/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.yml
index 108d93b92de..928b2f03236 100644
--- a/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.yml
+++ b/packages/twenty-server/src/engine/core-modules/application/constants/yarn-engine/.yarnrc.yml
@@ -1,5 +1,7 @@
enableInlineHunks: true
+enableScripts: false
+
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.9.2.cjs
diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.ts b/packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.ts
new file mode 100644
index 00000000000..33e01912262
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/dtos/application-registration-summary.dto.ts
@@ -0,0 +1,20 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IsOptional, IsString } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+
+@ObjectType('ApplicationRegistrationSummary')
+export class ApplicationRegistrationSummaryDTO {
+ @Field(() => UUIDScalarType)
+ id: string;
+
+ @IsOptional()
+ @IsString()
+ @Field({ nullable: true })
+ latestAvailableVersion?: string;
+
+ @Field(() => AppRegistrationSourceType)
+ sourceType: AppRegistrationSourceType;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
index 06958ab54f6..274a455628a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/dtos/application.dto.ts
@@ -10,7 +10,8 @@ import {
import GraphQLJSON from 'graphql-type-json';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/applicationVariable/dtos/application-variable.dto';
+import { ApplicationRegistrationSummaryDTO } from 'src/engine/core-modules/application/dtos/application-registration-summary.dto';
+import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/application/application-variable/dtos/application-variable.dto';
import { AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';
import { LogicFunctionDTO } from 'src/engine/metadata-modules/logic-function/dtos/logic-function.dto';
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
@@ -29,12 +30,12 @@ export class ApplicationDTO {
@IsOptional()
@IsString()
- @Field()
+ @Field({ nullable: true })
description?: string;
@IsOptional()
@IsString()
- @Field()
+ @Field({ nullable: true })
version?: string;
@IsString()
@@ -64,6 +65,11 @@ export class ApplicationDTO {
@Field(() => GraphQLJSON)
availablePackages: Record<string, string>;
+ @IsOptional()
+ @IsUUID()
+ @Field(() => UUIDScalarType, { nullable: true })
+ applicationRegistrationId?: string;
+
@Field(() => Boolean)
@IsBoolean()
canBeUninstalled: boolean;
@@ -93,4 +99,8 @@ export class ApplicationDTO {
@Field(() => [ApplicationVariableEntityDTO])
applicationVariables?: ApplicationVariableEntityDTO[];
+
+ @IsOptional()
+ @Field(() => ApplicationRegistrationSummaryDTO, { nullable: true })
+ applicationRegistration?: ApplicationRegistrationSummaryDTO;
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/resolvers/marketplace.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/resolvers/marketplace.resolver.ts
deleted file mode 100644
index 9b57c5659b6..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/resolvers/marketplace.resolver.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { UseGuards } from '@nestjs/common';
-import { Mutation, Query } from '@nestjs/graphql';
-
-import { PermissionFlagType } from 'twenty-shared/constants';
-
-import { MarketplaceAppDTO } from 'src/engine/core-modules/application/dtos/marketplace-app.dto';
-import { MarketplaceService } from 'src/engine/core-modules/application/services/marketplace.service';
-import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-
-@MetadataResolver()
-@UseGuards(UserAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
-export class MarketplaceResolver {
- constructor(private readonly marketplaceService: MarketplaceService) {}
-
- @Query(() => [MarketplaceAppDTO])
- async findManyMarketplaceApps(): Promise<MarketplaceAppDTO[]> {
- return this.marketplaceService.findAllMarketplaceApps();
- }
-
- @Mutation(() => Boolean)
- @UseGuards(SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS))
- async installMarketplaceApp(): Promise<boolean> {
- // TODO
- return true;
- }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/marketplace.service.ts b/packages/twenty-server/src/engine/core-modules/application/services/marketplace.service.ts
deleted file mode 100644
index a3b49cc8bce..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/services/marketplace.service.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-// eslint-disable-next-line no-restricted-imports
-import { lowerCase, upperFirst } from 'lodash';
-import { type Manifest } from 'twenty-shared/application';
-import { PackageJson } from 'type-fest';
-
-import {
- MarketplaceAppDTO,
- MarketplaceAppDefaultRoleDTO,
- MarketplaceAppFieldDTO,
- MarketplaceAppFrontComponentDTO,
- MarketplaceAppLogicFunctionDTO,
- MarketplaceAppObjectDTO,
-} from 'src/engine/core-modules/application/dtos/marketplace-app.dto';
-import { MOCKED_MARKETPLACE_APP } from 'src/engine/core-modules/application/services/mocked-marketplace-app.constant';
-
-type GitHubContent = {
- name: string;
- path: string;
- type: 'file' | 'dir';
- download_url?: string;
-};
-
-const GITHUB_RAW_BASE_URL =
- 'https://raw.githubusercontent.com/twentyhq/twenty/main/packages/twenty-apps';
-const GITHUB_API_BASE_URL =
- 'https://api.github.com/repos/twentyhq/twenty/contents/packages/twenty-apps';
-
-const CACHE_TTL_MS = 60 * 60 * 1000;
-
-@Injectable()
-export class MarketplaceService {
- private readonly logger = new Logger(MarketplaceService.name);
-
- private cachedApps: MarketplaceAppDTO[] | null = null;
- private cacheTimestamp: number | null = null;
-
- async findAllMarketplaceApps(): Promise<MarketplaceAppDTO[]> {
- if (this.isCacheValid()) {
- return this.cachedApps as MarketplaceAppDTO[];
- }
-
- const apps = await this.fetchAllMarketplaceApps();
-
- this.cachedApps = apps;
- this.cacheTimestamp = Date.now();
-
- return apps;
- }
-
- private isCacheValid(): boolean {
- if (this.cachedApps === null || this.cacheTimestamp === null) {
- return false;
- }
-
- return Date.now() - this.cacheTimestamp < CACHE_TTL_MS;
- }
-
- private async fetchAllMarketplaceApps(): Promise<MarketplaceAppDTO[]> {
- const apps: MarketplaceAppDTO[] = [];
-
- apps.push(MOCKED_MARKETPLACE_APP); // To remove once we have apps on marketplace
-
- try {
- const appDirs = await this.getAppDirectoriesFromGitHub();
-
- for (const appDir of appDirs) {
- try {
- const manifest = await this.loadAppManifestFromGithub(appDir);
-
- if (manifest) {
- apps.push(manifest);
- } else {
- // to remove after manifest are committed to the repo
- const appName = appDir.replace(/^community\//, '');
- const appLabel = upperFirst(lowerCase(appName));
-
- apps.push({
- id: appName,
- name: appLabel,
- description: '',
- icon: '',
- version: '',
- author: 'Anonymous',
- category: '',
- logo: undefined,
- screenshots: [],
- aboutDescription: '',
- providers: [],
- websiteUrl: '',
- termsUrl: '',
- objects: [],
- fields: [],
- logicFunctions: [],
- frontComponents: [],
- });
- }
- } catch (error) {
- this.logger.warn(
- `Failed to load manifest from ${appDir}: ${error instanceof Error ? error.message : String(error)}`,
- );
- }
- }
- } catch (error) {
- this.logger.error(
- `Failed to fetch marketplace apps from GitHub: ${error instanceof Error ? error.message : String(error)}`,
- );
- }
-
- return apps;
- }
-
- private async getAppDirectoriesFromGitHub(): Promise<string[]> {
- const directories: string[] = [];
-
- const rootContents = await this.fetchGitHubDirectory('');
-
- for (const entry of rootContents) {
- if (entry.name === 'community') {
- const communityContents = await this.fetchGitHubDirectory('community');
-
- for (const communityEntry of communityContents) {
- if (communityEntry.type !== 'dir') continue;
- if (communityEntry.name.startsWith('.')) continue;
-
- directories.push(`community/${communityEntry.name}`);
- }
- }
- }
-
- return directories;
- }
-
- private async fetchGitHubDirectory(path: string): Promise<GitHubContent[]> {
- const url = path ? `${GITHUB_API_BASE_URL}/${path}` : GITHUB_API_BASE_URL;
-
- const response = await fetch(url, {
- headers: {
- Accept: 'application/vnd.github.v3+json',
- 'User-Agent': 'Twenty-Marketplace',
- },
- });
-
- if (!response.ok) {
- throw new Error(`GitHub API error: ${response.status}`);
- }
-
- return response.json();
- }
-
- private async fetchGitHubFile(path: string): Promise<string | null> {
- const url = `${GITHUB_RAW_BASE_URL}/${path}`;
-
- const response = await fetch(url, {
- headers: {
- 'User-Agent': 'Twenty-Marketplace',
- },
- });
-
- if (!response.ok) {
- if (response.status === 404) {
- return null;
- }
- throw new Error(`GitHub raw file error: ${response.status}`);
- }
-
- return response.text();
- }
-
- private async loadAppManifestFromGithub(
- appPath: string,
- ): Promise<MarketplaceAppDTO | null> {
- const manifestContent = await this.fetchGitHubFile(
- `${appPath}/.twenty/output/manifest.json`,
- );
-
- if (!manifestContent) {
- return null;
- }
-
- const packageJsonContent = await this.fetchGitHubFile(
- `${appPath}/.twenty/output/package.json`,
- );
-
- if (!packageJsonContent) {
- return null;
- }
-
- const manifest = JSON.parse(manifestContent) as Manifest;
- const packageJson = JSON.parse(packageJsonContent) as PackageJson;
-
- const { application } = manifest;
-
- if (!application.author || !application.category) {
- return null;
- }
-
- const objects: MarketplaceAppObjectDTO[] = (manifest.objects ?? []).map(
- (manifestObject) => ({
- universalIdentifier: manifestObject.universalIdentifier,
- nameSingular: manifestObject.nameSingular,
- namePlural: manifestObject.namePlural,
- labelSingular: manifestObject.labelSingular,
- labelPlural: manifestObject.labelPlural,
- description: manifestObject.description,
- icon: manifestObject.icon,
- fields: (manifestObject.fields ?? []).map((field) => ({
- name: field.name ?? '',
- type: field.type,
- label: field.label ?? '',
- description: field.description,
- icon: field.icon,
- universalIdentifier: field.universalIdentifier,
- objectUniversalIdentifier: manifestObject.universalIdentifier,
- })),
- }),
- );
-
- const fields: MarketplaceAppFieldDTO[] = (manifest.fields ?? []).map(
- (manifestField) => {
- return {
- name: manifestField.name,
- type: manifestField.type,
- label: manifestField.label,
- description: manifestField.description,
- icon: manifestField.icon,
- objectUniversalIdentifier: manifestField.objectUniversalIdentifier,
- universalIdentifier: manifestField.universalIdentifier,
- };
- },
- );
-
- const logicFunctions: MarketplaceAppLogicFunctionDTO[] = (
- manifest.logicFunctions ?? []
- ).map((manifestLogicFunction) => ({
- name: manifestLogicFunction.name ?? '',
- description: manifestLogicFunction.description,
- timeoutSeconds: manifestLogicFunction.timeoutSeconds,
- }));
-
- const frontComponents: MarketplaceAppFrontComponentDTO[] = (
- manifest.frontComponents ?? []
- ).map((manifestFrontComponent) => ({
- name: manifestFrontComponent.name ?? '',
- description: manifestFrontComponent.description,
- }));
-
- const defaultRole = this.resolveDefaultRole(
- manifest,
- application.defaultRoleUniversalIdentifier,
- );
-
- return {
- id: application.universalIdentifier,
- name: application.displayName,
- description: application.description ?? '',
- icon: application.icon ?? 'IconApps',
- version: packageJson.version ?? '0.1.0',
- author: application.author,
- category: application.category,
- logo: this.resolveAssetUrl(appPath, application.logoUrl),
- screenshots: this.resolveAssetUrls(appPath, application.screenshots),
- aboutDescription: application.aboutDescription ?? '',
- providers: application.providers ?? [],
- websiteUrl: application.websiteUrl,
- termsUrl: application.termsUrl,
- objects,
- fields,
- logicFunctions,
- frontComponents,
- defaultRole,
- };
- }
-
- private resolveDefaultRole(
- manifest: Manifest,
- defaultRoleUniversalIdentifier: string,
- ): MarketplaceAppDefaultRoleDTO | undefined {
- const roleManifest = manifest.roles?.find(
- (role) => role.universalIdentifier === defaultRoleUniversalIdentifier,
- );
-
- if (!roleManifest) {
- return undefined;
- }
-
- return {
- id: roleManifest.universalIdentifier,
- label: roleManifest.label,
- description: roleManifest.description,
- canReadAllObjectRecords: roleManifest.canReadAllObjectRecords ?? false,
- canUpdateAllObjectRecords:
- roleManifest.canUpdateAllObjectRecords ?? false,
- canSoftDeleteAllObjectRecords:
- roleManifest.canSoftDeleteAllObjectRecords ?? false,
- canDestroyAllObjectRecords:
- roleManifest.canDestroyAllObjectRecords ?? false,
- canUpdateAllSettings: roleManifest.canUpdateAllSettings ?? false,
- canAccessAllTools: roleManifest.canAccessAllTools ?? false,
- objectPermissions: (roleManifest.objectPermissions ?? []).map(
- (permission) => ({
- objectUniversalIdentifier: permission.objectUniversalIdentifier,
- canReadObjectRecords: permission.canReadObjectRecords,
- canUpdateObjectRecords: permission.canUpdateObjectRecords,
- canSoftDeleteObjectRecords: permission.canSoftDeleteObjectRecords,
- canDestroyObjectRecords: permission.canDestroyObjectRecords,
- }),
- ),
- fieldPermissions: (roleManifest.fieldPermissions ?? []).map(
- (permission) => ({
- objectUniversalIdentifier: permission.objectUniversalIdentifier,
- fieldUniversalIdentifier: permission.fieldUniversalIdentifier,
- canReadFieldValue: permission.canReadFieldValue,
- canUpdateFieldValue: permission.canUpdateFieldValue,
- }),
- ),
- permissionFlags: (roleManifest.permissionFlags ?? []).map((flag) =>
- flag.toString(),
- ),
- };
- }
-
- private resolveAssetUrl(
- appPath: string,
- relativePath: string | undefined,
- ): string | undefined {
- if (!relativePath) {
- return undefined;
- }
-
- return `${GITHUB_RAW_BASE_URL}/${appPath}/${relativePath}`;
- }
-
- private resolveAssetUrls(
- appPath: string,
- relativePaths: string[] | undefined,
- ): string[] {
- if (!relativePaths) {
- return [];
- }
-
- return relativePaths
- .map((path) => this.resolveAssetUrl(appPath, path))
- .filter((url): url is string => url !== undefined);
- }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/mocked-marketplace-app.constant.ts b/packages/twenty-server/src/engine/core-modules/application/services/mocked-marketplace-app.constant.ts
deleted file mode 100644
index 5c9a7b31de5..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/services/mocked-marketplace-app.constant.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { type MarketplaceAppDTO } from 'src/engine/core-modules/application/dtos/marketplace-app.dto';
-
-// Readable mock identifiers for the Data Enrichment app
-const MOCK_APP_ID = 'a1b2c3d4-0000-0000-0000-000000000001';
-const MOCK_ROLE_ID = 'a1b2c3d4-0000-0000-0000-000000000010';
-const MOCK_ENRICHMENT_JOB_UNIVERSAL_ID = 'a1b2c3d4-0000-0000-0000-000000000100';
-
-// Standard object universalIdentifiers from STANDARD_OBJECTS
-const COMPANY_UNIVERSAL_ID = '20202020-b374-4779-a561-80086cb2e17f';
-const PERSON_UNIVERSAL_ID = '20202020-e674-48e5-a542-72570eee7213';
-
-// Standard field universalIdentifiers
-const COMPANY_NAME_FIELD_UNIVERSAL_ID = '20202020-4d99-4e2e-a84c-4a27837b1ece';
-
-// Enrichment job field universalIdentifiers
-const MOCK_ENRICHMENT_JOB_STATUS_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000101';
-const MOCK_ENRICHMENT_JOB_PROVIDER_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000102';
-const MOCK_ENRICHMENT_JOB_ENRICHED_AT_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000103';
-const MOCK_ENRICHMENT_JOB_RECORD_ID_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000104';
-
-// App-provided field universalIdentifiers on standard objects
-const COMPANY_INDUSTRY_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000201';
-const COMPANY_EMPLOYEE_COUNT_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000202';
-const PERSON_LINKEDIN_URL_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000203';
-const PERSON_JOB_TITLE_FIELD_UNIVERSAL_ID =
- 'a1b2c3d4-0000-0000-0000-000000000204';
-
-const MOCK_LOGO_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" fill="#1a2744"><ellipse cx="38" cy="20" rx="28" ry="10"/><rect x="10" y="20" width="56" height="50"/><ellipse cx="38" cy="70" rx="28" ry="10"/><ellipse cx="38" cy="35" rx="28" ry="10" fill="none" stroke="#fff" stroke-width="3"/><ellipse cx="38" cy="52" rx="28" ry="10" fill="none" stroke="#fff" stroke-width="3"/><circle cx="72" cy="62" r="22" fill="#1a2744"/><circle cx="72" cy="62" r="18" fill="#fff"/><path d="M72 50 L72 74 M62 58 L72 48 L82 58" stroke="#1a2744" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/></svg>`;
-
-export const MOCKED_MARKETPLACE_APP: MarketplaceAppDTO = {
- id: MOCK_APP_ID,
- name: 'Data Enrichment',
- description: 'Enrich your data easily. Choose your provider.',
- icon: 'IconSparkles',
- version: '1.0.0',
- author: 'Cosmos Labs',
- category: 'Data',
- logo: `data:image/svg+xml,${encodeURIComponent(MOCK_LOGO_SVG)}`,
- screenshots: [
- 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+1',
- 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+2',
- 'https://placehold.co/800x400/f5f5f5/666?text=Screenshot+3',
- ],
- aboutDescription:
- 'Enhance your workspace with automated data intelligence. This app monitors your new records and automatically populates missing details such as job titles, company size, social profiles, and industry insights.',
- providers: ['Clearbit', 'Apollo', 'Hunter.io'],
- websiteUrl: 'https://google.com',
- termsUrl: 'https://google.com',
- objects: [
- {
- universalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- nameSingular: 'enrichmentJob',
- namePlural: 'enrichmentJobs',
- labelSingular: 'Enrichment Job',
- labelPlural: 'Enrichment Jobs',
- description: 'Tracks data enrichment requests and their status',
- icon: 'IconSparkles',
- fields: [
- {
- name: 'status',
- type: 'SELECT',
- label: 'Status',
- description: 'Current status of the enrichment job',
- icon: 'IconProgressCheck',
- universalIdentifier: MOCK_ENRICHMENT_JOB_STATUS_FIELD_UNIVERSAL_ID,
- objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- },
- {
- name: 'provider',
- type: 'TEXT',
- label: 'Provider',
- description: 'Enrichment provider used',
- icon: 'IconCloud',
- universalIdentifier: MOCK_ENRICHMENT_JOB_PROVIDER_FIELD_UNIVERSAL_ID,
- objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- },
- {
- name: 'enrichedAt',
- type: 'DATE_TIME',
- label: 'Enriched At',
- description: 'When the enrichment was completed',
- icon: 'IconCalendar',
- universalIdentifier:
- MOCK_ENRICHMENT_JOB_ENRICHED_AT_FIELD_UNIVERSAL_ID,
- objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- },
- {
- name: 'recordId',
- type: 'TEXT',
- label: 'Record ID',
- description: 'ID of the enriched record',
- icon: 'IconKey',
- universalIdentifier: MOCK_ENRICHMENT_JOB_RECORD_ID_FIELD_UNIVERSAL_ID,
- objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- },
- ],
- },
- ],
- fields: [
- {
- name: 'industry',
- type: 'TEXT',
- label: 'Industry',
- description: 'Company industry from enrichment',
- icon: 'IconBuildingFactory2',
- objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
- universalIdentifier: COMPANY_INDUSTRY_FIELD_UNIVERSAL_ID,
- },
- {
- name: 'employeeCount',
- type: 'NUMBER',
- label: 'Employee Count',
- description: 'Number of employees from enrichment',
- icon: 'IconUsers',
- objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
- universalIdentifier: COMPANY_EMPLOYEE_COUNT_FIELD_UNIVERSAL_ID,
- },
- {
- name: 'linkedInUrl',
- type: 'LINKS',
- label: 'LinkedIn URL',
- description: 'LinkedIn profile URL from enrichment',
- icon: 'IconBrandLinkedin',
- objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
- universalIdentifier: PERSON_LINKEDIN_URL_FIELD_UNIVERSAL_ID,
- },
- {
- name: 'jobTitle',
- type: 'TEXT',
- label: 'Job Title',
- description: 'Job title from enrichment',
- icon: 'IconBriefcase',
- objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
- universalIdentifier: PERSON_JOB_TITLE_FIELD_UNIVERSAL_ID,
- },
- ],
- logicFunctions: [
- {
- name: 'enrich-on-create',
- description: 'Automatically enriches new records when they are created',
- timeoutSeconds: 30,
- },
- ],
- frontComponents: [],
- defaultRole: {
- id: MOCK_ROLE_ID,
- label: 'Data Enrichment default role',
- description: 'Default permissions for the Data Enrichment app',
- canReadAllObjectRecords: true,
- canUpdateAllObjectRecords: true,
- canSoftDeleteAllObjectRecords: true,
- canDestroyAllObjectRecords: true,
- canUpdateAllSettings: false,
- canAccessAllTools: false,
- objectPermissions: [
- {
- // Company: revoke soft-delete
- objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: false,
- canDestroyObjectRecords: false,
- },
- {
- // Person: no overrides (matches defaults)
- objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: false,
- },
- {
- // Enrichment Job (app-custom object): revoke soft-delete
- objectUniversalIdentifier: MOCK_ENRICHMENT_JOB_UNIVERSAL_ID,
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: false,
- canDestroyObjectRecords: false,
- },
- ],
- fieldPermissions: [
- {
- objectUniversalIdentifier: COMPANY_UNIVERSAL_ID,
- fieldUniversalIdentifier: COMPANY_NAME_FIELD_UNIVERSAL_ID,
- canReadFieldValue: true,
- canUpdateFieldValue: false,
- },
- {
- objectUniversalIdentifier: PERSON_UNIVERSAL_ID,
- fieldUniversalIdentifier: PERSON_JOB_TITLE_FIELD_UNIVERSAL_ID,
- canReadFieldValue: true,
- canUpdateFieldValue: false,
- },
- ],
- permissionFlags: ['DATA_MODEL', 'API_KEYS_AND_WEBHOOKS'],
- },
-};
diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/assert-valid-npm-package-name.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/assert-valid-npm-package-name.util.ts
new file mode 100644
index 00000000000..dc888b7dccb
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/utils/assert-valid-npm-package-name.util.ts
@@ -0,0 +1,18 @@
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+
+// NPM package names: optional @scope/ prefix, then name segment
+// Rejects path traversal (..), control characters, and non-npm-valid names
+const NPM_PACKAGE_NAME_REGEX =
+ /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
+
+export const assertValidNpmPackageName = (name: string): void => {
+ if (!NPM_PACKAGE_NAME_REGEX.test(name) || name.includes('..')) {
+ throw new ApplicationException(
+ 'Invalid npm package name',
+ ApplicationExceptionCode.INVALID_INPUT,
+ );
+ }
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/extract-tarball-securely.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/extract-tarball-securely.util.ts
new file mode 100644
index 00000000000..94c00efe988
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/utils/extract-tarball-securely.util.ts
@@ -0,0 +1,49 @@
+import { resolve, sep } from 'path';
+
+import * as tar from 'tar';
+
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+
+export const MAX_EXTRACTED_SIZE_BYTES = 500 * 1024 * 1024;
+
+export const extractTarballSecurely = async (
+ tarballPath: string,
+ targetDir: string,
+): Promise<void> => {
+ let totalExtractedSize = 0;
+ const resolvedTarget = resolve(targetDir) + sep;
+
+ await tar.extract({
+ file: tarballPath,
+ cwd: targetDir,
+ filter: (entryPath, entry) => {
+ const resolvedEntry = resolve(targetDir, entryPath);
+
+ if (!resolvedEntry.startsWith(resolvedTarget)) {
+ return false;
+ }
+
+ if ('type' in entry) {
+ const entryType = entry.type;
+
+ if (entryType === 'SymbolicLink' || entryType === 'Link') {
+ return false;
+ }
+ }
+
+ totalExtractedSize += entry.size ?? 0;
+
+ if (totalExtractedSize > MAX_EXTRACTED_SIZE_BYTES) {
+ throw new ApplicationException(
+ `Extracted size exceeds ${MAX_EXTRACTED_SIZE_BYTES} bytes`,
+ ApplicationExceptionCode.TARBALL_EXTRACTION_FAILED,
+ );
+ }
+
+ return true;
+ },
+ });
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/read-json-file.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/read-json-file.util.ts
new file mode 100644
index 00000000000..99bda64fa9d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/utils/read-json-file.util.ts
@@ -0,0 +1,38 @@
+import { promises as fs } from 'fs';
+import { join } from 'path';
+
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+
+export const readJsonFile = async <T>(
+ dir: string,
+ filename: string,
+): Promise<T | null> => {
+ const filePath = join(dir, filename);
+
+ try {
+ const content = await fs.readFile(filePath, 'utf-8');
+
+ return JSON.parse(content) as T;
+ } catch {
+ return null;
+ }
+};
+
+export const readJsonFileOrThrow = async <T>(
+ dir: string,
+ filename: string,
+): Promise<T> => {
+ const result = await readJsonFile<T>(dir, filename);
+
+ if (result === null) {
+ throw new ApplicationException(
+ `${filename} not found or invalid in resolved package`,
+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,
+ );
+ }
+
+ return result;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/tarball-utils.ts b/packages/twenty-server/src/engine/core-modules/application/utils/tarball-utils.ts
new file mode 100644
index 00000000000..122fca050e6
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/utils/tarball-utils.ts
@@ -0,0 +1,21 @@
+import { promises as fs } from 'fs';
+import { join } from 'path';
+
+// npm pack wraps contents in a package/ subdirectory
+export const resolvePackageContentDir = async (
+ extractDir: string,
+): Promise<string> => {
+ const packageSubdir = join(extractDir, 'package');
+
+ try {
+ const stat = await fs.stat(packageSubdir);
+
+ if (stat.isDirectory()) {
+ return packageSubdir;
+ }
+ } catch {
+ // no package/ subdirectory — contents are at root
+ }
+
+ return extractDir;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/services/workspace-flat-application-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/application/workspace-flat-application-map-cache.service.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application/services/workspace-flat-application-map-cache.service.ts
rename to packages/twenty-server/src/engine/core-modules/application/workspace-flat-application-map-cache.service.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
index 5247ee8de14..e2652149eab 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -4,9 +4,9 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';
import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
import { AppTokenService } from 'src/engine/core-modules/app-token/services/app-token.service';
-import { ApplicationRegistrationModule } from 'src/engine/core-modules/application-registration/application-registration.module';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { AuditModule } from 'src/engine/core-modules/audit/audit.module';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
index f74c554d21a..e9f5d871d02 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
@@ -29,7 +29,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
import { AuthProviderEnum } from 'src/engine/core-modules/workspace/types/workspace.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { AuthService } from './auth.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index a8d350008f3..98488ba1e01 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -13,7 +13,7 @@ import { AppPath } from 'twenty-shared/types';
import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationRegistrationService } from 'src/engine/core-modules/application-registration/application-registration.service';
+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
import {
AppTokenEntity,
AppTokenType,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
index 872c3c431c9..78d10734e62 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
@@ -10,7 +10,7 @@ import { v4 } from 'uuid';
import { USER_SIGNUP_EVENT_NAME } from 'src/engine/api/graphql/workspace-query-runner/constants/user-signup-event-name.constants';
import { type AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import {
AuthException,
AuthExceptionCode,
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index 512963f3b37..80d9f64cc8e 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -7,9 +7,11 @@ import { ActorModule } from 'src/engine/core-modules/actor/actor.module';
import { AdminPanelModule } from 'src/engine/core-modules/admin-panel/admin-panel.module';
import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
import { AppTokenModule } from 'src/engine/core-modules/app-token/app-token.module';
-import { ApplicationRegistrationModule } from 'src/engine/core-modules/application-registration/application-registration.module';
-import { ApplicationSyncModule } from 'src/engine/core-modules/application/application-sync.module';
+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';
+import { ApplicationDevelopmentModule } from 'src/engine/core-modules/application/application-development/application-development.module';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';
import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
import { ApprovedAccessDomainModule } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.module';
import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
@@ -91,7 +93,9 @@ import { FileModule } from './file/file.module';
OpenApiModule,
ApplicationRegistrationModule,
ApplicationModule,
- ApplicationSyncModule,
+ ApplicationInstallModule,
+ ApplicationDevelopmentModule,
+ MarketplaceModule,
AppTokenModule,
TimelineMessagingModule,
TimelineCalendarEventModule,
diff --git a/packages/twenty-server/src/engine/core-modules/file-storage/file-storage.module.ts b/packages/twenty-server/src/engine/core-modules/file-storage/file-storage.module.ts
index 4bff82ca2cb..1bbf279c0ba 100644
--- a/packages/twenty-server/src/engine/core-modules/file-storage/file-storage.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/file-storage/file-storage.module.ts
@@ -17,7 +17,7 @@ export class FileStorageModule {
TypeOrmModule.forFeature([FileEntity, ApplicationEntity]),
],
providers: [FileStorageDriverFactory, FileStorageService],
- exports: [FileStorageService],
+ exports: [FileStorageDriverFactory, FileStorageService],
};
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-ai-chat/services/file-ai-chat.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-ai-chat/services/file-ai-chat.service.ts
index 44f92e05fff..4bc37c362e7 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-ai-chat/services/file-ai-chat.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-ai-chat/services/file-ai-chat.service.ts
@@ -4,7 +4,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { FileFolder } from 'twenty-shared/types';
import { v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileWithSignedUrlDTO } from 'src/engine/core-modules/file/dtos/file-with-sign-url.dto';
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-core-picture/services/file-core-picture.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-core-picture/services/file-core-picture.service.ts
index e4b3ec47a9c..06394be2b5d 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-core-picture/services/file-core-picture.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-core-picture/services/file-core-picture.service.ts
@@ -10,7 +10,7 @@ import { isDefined } from 'twenty-shared/utils';
import { Like, type QueryRunner, Repository } from 'typeorm';
import { v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileWithSignedUrlDTO } from 'src/engine/core-modules/file/dtos/file-with-sign-url.dto';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-workflow/services/file-workflow.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-workflow/services/file-workflow.service.ts
index 66b9da1ea88..5ccb41aff2a 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-workflow/services/file-workflow.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-workflow/services/file-workflow.service.ts
@@ -4,7 +4,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { FileFolder } from 'twenty-shared/types';
import { v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { FileWithSignedUrlDTO } from 'src/engine/core-modules/file/dtos/file-with-sign-url.dto';
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
diff --git a/packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts b/packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts
index ddd5628a494..2d33d05c0f5 100644
--- a/packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts
@@ -54,6 +54,9 @@ export const fileFolderConfigs: Record<FileFolder, FileFolderConfig> = {
[FileFolder.Workflow]: {
ignoreExpirationToken: false,
},
+ [FileFolder.AppTarball]: {
+ ignoreExpirationToken: false,
+ },
};
export type AllowedFolders = KebabCase<keyof typeof FileFolder>;
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts
index 890d0a24502..8b02ebdcda0 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts
@@ -13,7 +13,7 @@ import {
} from 'src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface';
import { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
-import type { FlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/types/flat-application-variable.type';
+import type { FlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/types/flat-application-variable.type';
import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';
import { LOGIC_FUNCTION_EXECUTED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed';
import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/__tests__/build-env-var.spec.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/__tests__/build-env-var.spec.ts
index 6cde020aec4..51e8f8178e5 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/__tests__/build-env-var.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/__tests__/build-env-var.spec.ts
@@ -1,4 +1,4 @@
-import { type FlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/types/flat-application-variable.type';
+import { type FlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/types/flat-application-variable.type';
import { type SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';
import { buildEnvVar } from 'src/engine/core-modules/logic-function/logic-function-executor/utils/build-env-var';
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/build-env-var.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/build-env-var.ts
index 0b72e9eac71..ac71ebc021f 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/build-env-var.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/utils/build-env-var.ts
@@ -1,4 +1,4 @@
-import { type FlatApplicationVariable } from 'src/engine/core-modules/applicationVariable/types/flat-application-variable.type';
+import { type FlatApplicationVariable } from 'src/engine/core-modules/application/application-variable/types/flat-application-variable.type';
import { type SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';
export const buildEnvVar = (
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts
index e1be0149134..f9851d10a74 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts
@@ -15,7 +15,7 @@ import {
type OutputFile,
} from 'src/engine/core-modules/code-interpreter/drivers/interfaces/code-interpreter-driver.interface';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import {
type AccessTokenJwtPayload,
JwtTokenTypeEnum,
diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
index 6f97ec36827..205348ff768 100644
--- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
+++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
@@ -1634,6 +1634,26 @@ export class ConfigVariables {
@CastToPositiveNumber()
@IsOptional()
PG_DATABASE_REPLICA_TIMEOUT_MS: number = 10000;
+
+ @ConfigVariablesMetadata({
+ group: ConfigVariablesGroup.SERVER_CONFIG,
+ description:
+ 'Default npm registry URL for resolving app packages (e.g. https://registry.npmjs.org)',
+ type: ConfigVariableType.STRING,
+ })
+ @IsUrl({ require_tld: false })
+ @IsOptional()
+ APP_REGISTRY_URL: string = 'https://registry.npmjs.org';
+
+ @ConfigVariablesMetadata({
+ group: ConfigVariablesGroup.SERVER_CONFIG,
+ isSensitive: true,
+ description:
+ 'Auth token for the default npm registry (for private packages)',
+ type: ConfigVariableType.STRING,
+ })
+ @IsOptional()
+ APP_REGISTRY_TOKEN: string;
}
export const validate = (config: Record<string, unknown>): ConfigVariables => {
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts
index 55189d34505..edbe483234a 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts
@@ -4,7 +4,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
import { type Repository, type UpdateResult } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';
import { EmailVerificationService } from 'src/engine/core-modules/email-verification/services/email-verification.service';
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
index 82778890a62..1c8f0dbdabc 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -16,7 +16,7 @@ import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { fromFlatApplicationToApplicationDto } from 'src/engine/core-modules/application/utils/from-flat-application-to-application-dto.util';
import { BillingEntitlementDTO } from 'src/engine/core-modules/billing/dtos/billing-entitlement.dto';
import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
index a2b7325faae..c4546ddb35e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { isDefined } from 'twenty-shared/utils';
import { ILike, IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type CreateAgentInput } from 'src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input';
import { type UpdateAgentInput } from 'src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input';
import { fromCreateAgentInputToFlatAgent } from 'src/engine/metadata-modules/ai/ai-agent/utils/from-create-agent-input-to-flat-agent.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
index 5b433ac4ab5..3105499c269 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import {
CommandMenuItemException,
CommandMenuItemExceptionCode,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
index 284abb4c981..2ed425d1d2b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
@@ -6,7 +6,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type FindOneOptions, type Repository } from 'typeorm';
import { FeatureFlagKey } from 'twenty-shared/types';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
import { type DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/delete-field.input';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts
index ea945543ed9..6d92ceb7cb8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/__tests__/morph-relation-from-create-field-input-to-flat-field-metadatas-to-create.spec.ts
@@ -5,6 +5,7 @@ import { FieldMetadataType } from 'twenty-shared/types';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
@@ -26,7 +27,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {
description: null,
workspaceId: 'workspace-id',
version: null,
- sourceType: 'local',
+ sourceType: AppRegistrationSourceType.LOCAL,
sourcePath: '',
packageJsonChecksum: null,
packageJsonFileId: null,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts
index e55c01d0086..0676908f28e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/generate-morph-or-relation-flat-field-metadata-pair.spec.ts
@@ -6,6 +6,7 @@ import {
RelationType,
} from 'twenty-shared/types';
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import {
generateMorphOrRelationFlatFieldMetadataPair,
@@ -21,7 +22,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {
description: null,
version: null,
workspaceId: 'workspace-id',
- sourceType: 'local',
+ sourceType: AppRegistrationSourceType.LOCAL,
sourcePath: '',
packageJsonChecksum: null,
packageJsonFileId: null,
diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.service.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.service.ts
index 31e63c42071..36fdd6c4e9e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.service.ts
@@ -5,7 +5,7 @@ import { type Readable } from 'stream';
import { FileFolder } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source-helper.service.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source-helper.service.ts
index 9afa21fbe06..397069ad14f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source-helper.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source-helper.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { join } from 'path';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import {
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source.service.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source.service.ts
index 25982602d95..3fd3bbcaec2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/services/logic-function-from-source.service.ts
@@ -4,7 +4,7 @@ import { v4 } from 'uuid';
import { isDefined } from 'twenty-shared/utils';
import { SEED_LOGIC_FUNCTION_INPUT_SCHEMA } from 'twenty-shared/logic-function';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';
import { LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service.ts
index 5ece8beffa3..9dcc757831e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-deletion.service.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-deletion.service.ts
index 8021f2460ee..8ef7ce4e488 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-deletion.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-deletion.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { fromDeleteNavigationMenuItemInputToFlatNavigationMenuItemOrThrow } from 'src/engine/metadata-modules/flat-navigation-menu-item/utils/from-delete-navigation-menu-item-input-to-flat-navigation-menu-item-or-throw.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
index 140cd91ddd5..c9702d8a258 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -12,7 +12,7 @@ import { fromArrayToUniqueKeyRecord, isDefined } from 'twenty-shared/utils';
import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
import { v4 as uuidv4, v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts
index e6fe9316176..3bfef3e43e2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
index 324c09ba1bf..a9578dbe69d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { transformRichTextV2Value } from 'src/engine/core-modules/record-transformer/utils/transform-rich-text-v2.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-duplication.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-duplication.service.ts
index a7a366ba302..22e28a44613 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-duplication.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-duplication.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
index 53cb769b05f..4a6f36aff3c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
@@ -4,7 +4,7 @@ import { PageLayoutTabLayoutMode } from 'twenty-shared/types';
import { computeDiffBetweenObjects, isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
index ab5b9888a92..df0857648ce 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts
index e848c74b05c..34ed3189d15 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/__tests__/permissions.service.spec.ts
@@ -4,7 +4,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { PermissionFlagType } from 'twenty-shared/constants';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
index 42fb8733f37..a3f8cc4f4c3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
@@ -7,7 +7,7 @@ import { isDefined } from 'twenty-shared/utils';
import { In, Repository } from 'typeorm';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { TOOL_PERMISSION_FLAGS } from 'src/engine/metadata-modules/permissions/constants/tool-permission-flags';
import {
PermissionsException,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
index a3d6d84f9fa..03290ee1ac2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
index 7a242d33180..6fef0aa1f2a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
@@ -13,7 +13,7 @@ import { FeatureFlagKey } from 'twenty-shared/types';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
index 561451c714e..8f57ecebb9f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
@@ -5,7 +5,7 @@ import { msg } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import { Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
index bbcfca7379c..654fdb1237a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
@@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
index 3e405af3849..da0ee2ae86a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
index 51928fe646e..6c8b3cb8096 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
@@ -5,7 +5,7 @@ import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts
index 67077f3e910..df2d2e1a8db 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts
index f69d829cd1c..4c531e60f9e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts
index 24a50815f4f..04b1f71de1a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts
@@ -4,7 +4,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { type Repository } from 'typeorm';
import { ViewFilterGroupLogicalOperator } from 'twenty-shared/types';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';
import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts
index bb143030930..be1643b3b1f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { IsNull, type Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts
index cd60e64d9ad..7ad56f040ba 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts
index 55d2174af33..3c134a6e7dd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts
index 1165830e31e..e6ae6ddeb4c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
index 9261b201b8a..18453d0b7f3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
@@ -6,7 +6,7 @@ import { ViewType, ViewVisibility } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { In, IsNull, Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { generateMessageId } from 'src/engine/core-modules/i18n/utils/generateMessageId';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts
index de09af4aeee..5f03ac9aa7b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { IsNull, Repository } from 'typeorm';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { fromCreateWebhookInputToFlatWebhookToCreate } from 'src/engine/metadata-modules/flat-webhook/utils/from-create-webhook-input-to-flat-webhook-to-create.util';
diff --git a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
index 9450a3ea056..25b00365989 100644
--- a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
@@ -5,7 +5,7 @@ import {
import { type EntityMetadata } from 'typeorm';
import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
-import { type ApplicationVariableCacheMaps } from 'src/engine/core-modules/applicationVariable/types/application-variable-cache-maps.type';
+import { type ApplicationVariableCacheMaps } from 'src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type';
import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-core-schema.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-core-schema.util.ts
index cd2c71e596b..5d4ecc6d1ce 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-core-schema.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-core-schema.util.ts
@@ -1,7 +1,7 @@
import { type DataSource } from 'typeorm';
import { v4 } from 'uuid';
-import { type ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { type ApplicationService } from 'src/engine/core-modules/application/application.service';
import { seedBillingCustomers } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-customers.util';
import { seedBillingSubscriptions } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-subscriptions.util';
import {
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
index f23c2b9a09e..45d2663c05b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
@@ -5,7 +5,7 @@ import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
import { DataSource } from 'typeorm';
import { FeatureFlagKey } from 'twenty-shared/types';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts
index bbdf76913d8..45ca9974227 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications.ts
@@ -1,3 +1,4 @@
+import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
import { type ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
export const TWENTY_STANDARD_APPLICATION = {
@@ -7,7 +8,7 @@ export const TWENTY_STANDARD_APPLICATION = {
'Twenty is an open-source CRM that allows you to manage your sales and customer relationships',
version: '1.0.0',
sourcePath: 'cli-sync',
- sourceType: 'local',
+ sourceType: AppRegistrationSourceType.LOCAL,
} as const satisfies Pick<
ApplicationEntity,
| 'universalIdentifier'
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts
index eee986fb162..e5333f8eac9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts
index 39ba5c56b23..e251242ad96 100644
--- a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts
@@ -1,4 +1,4 @@
-import { type ApplicationVariableEntity } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
+import { type ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import { type BillingMeterEntity } from 'src/engine/core-modules/billing/entities/billing-meter.entity';
import { type BillingPriceEntity } from 'src/engine/core-modules/billing/entities/billing-price.entity';
import { type BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
index cd7b9d66836..19d102407a9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
index aa2f0647b87..1a6be85bcc7 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { type ToolSet } from 'ai';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
diff --git a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
index 36a598199b0..a061e1af421 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
@@ -1,4 +1,4 @@
-import type { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import type { ApplicationService } from 'src/engine/core-modules/application/application.service';
import type { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service';
import type { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
import type { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
index 7476a8173d3..8e52c4d8fcd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { FieldActorSource } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/services/application.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { buildApplicationAuthContext } from 'src/engine/core-modules/auth/utils/build-application-auth-context.util';
import { buildUserAuthContext } from 'src/engine/core-modules/auth/utils/build-user-auth-context.util';
diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts
index 5e0bd321c51..7773492965e 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration-variable/utils/application-registration-variable-api.util.ts
@@ -9,7 +9,7 @@ import { type CommonResponseBody } from 'test/integration/metadata/types/common-
import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
-import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application-registration/application-registration-variable.entity';
+import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
type VariableFields = Pick<
ApplicationRegistrationVariableEntity,
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap
index ae79fa0601f..4b1d21d552e 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-install-application-feature-flag-disabled.integration-spec.ts.snap
@@ -3,11 +3,11 @@
exports[`Install application should fail when feature flag is disabled should fail with forbidden error when feature flag is disabled 1`] = `
{
"extensions": {
- "code": "BAD_USER_INPUT",
+ "code": "FORBIDDEN",
"subCode": "FORBIDDEN",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
"message": "Application installation from tarball is not enabled",
- "name": "UserInputError",
+ "name": "ForbiddenError",
}
`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts
new file mode 100644
index 00000000000..50b49fdf45d
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts
@@ -0,0 +1,305 @@
+import crypto from 'crypto';
+import { promises as fs } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+
+import request from 'supertest';
+import * as tar from 'tar';
+import { type DataSource } from 'typeorm';
+import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';
+
+const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+
+const createTestTarball = async (
+ files: Record<string, string>,
+): Promise<Buffer> => {
+ const tempId = crypto.randomUUID();
+ const sourceDir = join(tmpdir(), `test-tarball-src-${tempId}`);
+ const tarballPath = join(tmpdir(), `test-tarball-${tempId}.tar.gz`);
+
+ await fs.mkdir(sourceDir, { recursive: true });
+
+ for (const [name, content] of Object.entries(files)) {
+ const filePath = join(sourceDir, name);
+ const dir = filePath.substring(0, filePath.lastIndexOf('/'));
+
+ if (dir !== sourceDir) {
+ await fs.mkdir(dir, { recursive: true });
+ }
+ await fs.writeFile(filePath, content);
+ }
+
+ await tar.create(
+ {
+ file: tarballPath,
+ gzip: true,
+ cwd: sourceDir,
+ },
+ Object.keys(files),
+ );
+
+ const buffer = await fs.readFile(tarballPath);
+
+ await fs.rm(sourceDir, { recursive: true, force: true });
+ await fs.rm(tarballPath, { force: true });
+
+ return buffer;
+};
+
+const createValidManifest = (universalIdentifier: string) =>
+ JSON.stringify({
+ application: {
+ universalIdentifier,
+ displayName: 'Test Tarball App',
+ description: 'A test app',
+ icon: 'IconTestPipe',
+ defaultRoleUniversalIdentifier: crypto.randomUUID(),
+ applicationVariables: {},
+ packageJsonChecksum: null,
+ yarnLockChecksum: null,
+ apiClientChecksum: null,
+ },
+ roles: [],
+ skills: [],
+ objects: [],
+ fields: [],
+ logicFunctions: [],
+ frontComponents: [],
+ publicAssets: [],
+ views: [],
+ navigationMenuItems: [],
+ pageLayouts: [],
+ });
+
+const insertRegistrationWithSource = async (
+ ds: DataSource,
+ params: {
+ universalIdentifier: string;
+ name: string;
+ sourceType: 'npm' | 'tarball' | 'local';
+ sourcePackage?: string;
+ },
+): Promise<string> => {
+ const id = crypto.randomUUID();
+ const oAuthClientId = crypto.randomUUID();
+
+ await ds.query(
+ `INSERT INTO core."applicationRegistration"
+ (id, "universalIdentifier", name, "oAuthClientId",
+ "oAuthRedirectUris", "oAuthScopes", "workspaceId",
+ "sourceType", "sourcePackage")
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+ [
+ id,
+ params.universalIdentifier,
+ params.name,
+ oAuthClientId,
+ [],
+ [],
+ TEST_WORKSPACE_ID,
+ params.sourceType,
+ params.sourcePackage ?? null,
+ ],
+ );
+
+ return id;
+};
+
+describe('App Distribution (integration)', () => {
+ let ds: DataSource;
+ const createdRegistrationIds: string[] = [];
+
+ beforeAll(() => {
+ jest.useRealTimers();
+ ds = global.testDataSource;
+ });
+
+ afterAll(async () => {
+ for (const id of createdRegistrationIds) {
+ await ds.query(
+ `DELETE FROM core."applicationRegistration" WHERE id = $1`,
+ [id],
+ );
+ }
+ jest.useFakeTimers();
+ });
+
+ describe('Upload tarball via GraphQL', () => {
+ it('should reject tarball without manifest.json', async () => {
+ const tarball = await createTestTarball({
+ 'readme.txt': 'no manifest here',
+ });
+
+ const { errors } = await uploadAppTarball({
+ tarballBuffer: tarball,
+ expectToFail: true,
+ });
+
+ expect(errors).toBeDefined();
+ expect(
+ errors?.some((error: { message: string }) =>
+ error.message.includes('manifest.json'),
+ ),
+ ).toBe(true);
+ });
+
+ it('should successfully upload a valid tarball and create registration', async () => {
+ const uid = crypto.randomUUID();
+ const manifest = createValidManifest(uid);
+
+ const tarball = await createTestTarball({
+ 'manifest.json': manifest,
+ 'package.json': JSON.stringify({
+ name: 'test-app',
+ version: '1.0.0',
+ }),
+ });
+
+ const { data, errors } = await uploadAppTarball({
+ tarballBuffer: tarball,
+ universalIdentifier: uid,
+ });
+
+ expect(errors).toBeUndefined();
+ expect(data?.uploadAppTarball.id).toBeDefined();
+ expect(data?.uploadAppTarball.universalIdentifier).toBe(uid);
+ createdRegistrationIds.push(data!.uploadAppTarball.id);
+
+ const rows = await ds.query(
+ `SELECT "sourceType" FROM core."applicationRegistration"
+ WHERE id = $1`,
+ [data!.uploadAppTarball.id],
+ );
+
+ expect(rows[0].sourceType).toBe('tarball');
+ });
+
+ it('should update existing tarball registration on re-upload', async () => {
+ const uid = crypto.randomUUID();
+ const manifest = createValidManifest(uid);
+
+ const tarball = await createTestTarball({
+ 'manifest.json': manifest,
+ 'package.json': JSON.stringify({
+ name: 'test-app',
+ version: '1.0.0',
+ }),
+ });
+
+ const firstResult = await uploadAppTarball({
+ tarballBuffer: tarball,
+ universalIdentifier: uid,
+ });
+
+ createdRegistrationIds.push(firstResult.data!.uploadAppTarball.id);
+
+ const secondResult = await uploadAppTarball({
+ tarballBuffer: tarball,
+ universalIdentifier: uid,
+ });
+
+ expect(secondResult.data?.uploadAppTarball.id).toBe(
+ firstResult.data?.uploadAppTarball.id,
+ );
+ });
+ });
+
+ describe('Source channel enforcement', () => {
+ it('should reject tarball upload for npm-sourced registration', async () => {
+ const uid = crypto.randomUUID();
+
+ const regId = await insertRegistrationWithSource(ds, {
+ universalIdentifier: uid,
+ name: 'NPM App',
+ sourceType: 'npm',
+ sourcePackage: '@test/npm-app',
+ });
+
+ createdRegistrationIds.push(regId);
+
+ const manifest = createValidManifest(uid);
+ const tarball = await createTestTarball({
+ 'manifest.json': manifest,
+ 'package.json': JSON.stringify({
+ name: 'test-app',
+ version: '1.0.0',
+ }),
+ });
+
+ const { errors } = await uploadAppTarball({
+ tarballBuffer: tarball,
+ universalIdentifier: uid,
+ expectToFail: true,
+ });
+
+ expect(errors).toBeDefined();
+ expect(
+ errors?.some((error: { message: string }) =>
+ error.message.includes('registered as npm'),
+ ),
+ ).toBe(true);
+ });
+
+ it('should allow tarball upload for local-sourced registration', async () => {
+ const uid = crypto.randomUUID();
+
+ const regId = await insertRegistrationWithSource(ds, {
+ universalIdentifier: uid,
+ name: 'Local Source App',
+ sourceType: 'local',
+ });
+
+ createdRegistrationIds.push(regId);
+
+ const manifest = createValidManifest(uid);
+ const tarball = await createTestTarball({
+ 'manifest.json': manifest,
+ 'package.json': JSON.stringify({
+ name: 'test-app',
+ version: '1.0.0',
+ }),
+ });
+
+ const { data, errors } = await uploadAppTarball({
+ tarballBuffer: tarball,
+ universalIdentifier: uid,
+ });
+
+ expect(errors).toBeUndefined();
+ expect(data?.uploadAppTarball.id).toBe(regId);
+
+ const rows = await ds.query(
+ `SELECT "sourceType" FROM core."applicationRegistration"
+ WHERE id = $1`,
+ [regId],
+ );
+
+ expect(rows[0].sourceType).toBe('tarball');
+ });
+ });
+
+ describe('Authentication', () => {
+ it('should reject unauthenticated requests', async () => {
+ const baseUrl = `http://localhost:${APP_PORT}`;
+
+ const response = await request(baseUrl)
+ .post('/metadata')
+ .field(
+ 'operations',
+ JSON.stringify({
+ query: `mutation UploadAppTarball($file: Upload!) {
+ uploadAppTarball(file: $file) { id }
+ }`,
+ variables: { file: null },
+ }),
+ )
+ .field('map', JSON.stringify({ '0': ['variables.file'] }))
+ .attach('0', Buffer.from('test'), {
+ filename: 'app.tar.gz',
+ contentType: 'application/gzip',
+ });
+
+ expect(response.body.errors).toBeDefined();
+ });
+ });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts
new file mode 100644
index 00000000000..d2e36c72190
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts
@@ -0,0 +1,193 @@
+import crypto from 'crypto';
+
+import request from 'supertest';
+import { type DataSource } from 'typeorm';
+
+const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+
+const MARKETPLACE_QUERY = `
+ query {
+ findManyMarketplaceApps {
+ id
+ name
+ description
+ author
+ sourcePackage
+ icon
+ version
+ category
+ }
+ }
+`;
+
+const INSTALL_MUTATION = `
+ mutation InstallMarketplaceApp($universalIdentifier: String!) {
+ installMarketplaceApp(universalIdentifier: $universalIdentifier)
+ }
+`;
+
+describe('Marketplace Catalog Sync (integration)', () => {
+ const baseUrl = `http://localhost:${APP_PORT}`;
+
+ let ds: DataSource;
+ const createdRegistrationIds: string[] = [];
+
+ beforeAll(() => {
+ jest.useRealTimers();
+ ds = global.testDataSource;
+ });
+
+ afterAll(async () => {
+ for (const id of createdRegistrationIds) {
+ await ds.query(
+ `DELETE FROM core."applicationRegistration" WHERE id = $1`,
+ [id],
+ );
+ }
+ jest.useFakeTimers();
+ });
+
+ const gqlRequest = (query: string, variables?: Record<string, unknown>) =>
+ request(baseUrl)
+ .post('/metadata')
+ .set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
+ .send({ query, variables });
+
+ const insertCatalogRegistration = async (params: {
+ universalIdentifier: string;
+ name: string;
+ sourcePackage: string;
+ latestAvailableVersion?: string;
+ marketplaceDisplayData?: Record<string, unknown>;
+ }): Promise<string> => {
+ const id = crypto.randomUUID();
+ const oAuthClientId = crypto.randomUUID();
+
+ await ds.query(
+ `INSERT INTO core."applicationRegistration"
+ (id, "universalIdentifier", name, "oAuthClientId",
+ "oAuthRedirectUris", "oAuthScopes", "workspaceId",
+ "sourceType", "sourcePackage", "latestAvailableVersion",
+ "marketplaceDisplayData")
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)`,
+ [
+ id,
+ params.universalIdentifier,
+ params.name,
+ oAuthClientId,
+ [],
+ [],
+ TEST_WORKSPACE_ID,
+ 'npm',
+ params.sourcePackage,
+ params.latestAvailableVersion ?? '1.0.0',
+ params.marketplaceDisplayData
+ ? JSON.stringify(params.marketplaceDisplayData)
+ : null,
+ ],
+ );
+
+ createdRegistrationIds.push(id);
+
+ return id;
+ };
+
+ describe('findManyMarketplaceApps', () => {
+ const npmUid = crypto.randomUUID();
+ const tarballUid = crypto.randomUUID();
+ const curatedUid = 'a1b2c3d4-0000-0000-0000-000000000001';
+
+ // Insert all data before queries so the in-memory cache is populated once
+ // with complete data rather than being stale for later tests.
+ beforeAll(async () => {
+ await insertCatalogRegistration({
+ universalIdentifier: npmUid,
+ name: 'Test Catalog App',
+ sourcePackage: '@test/catalog-app',
+ });
+
+ const tarballId = crypto.randomUUID();
+ const oAuthClientId = crypto.randomUUID();
+
+ await ds.query(
+ `INSERT INTO core."applicationRegistration"
+ (id, "universalIdentifier", name, "oAuthClientId",
+ "oAuthRedirectUris", "oAuthScopes", "workspaceId",
+ "sourceType")
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
+ [
+ tarballId,
+ tarballUid,
+ 'Tarball Only App',
+ oAuthClientId,
+ [],
+ [],
+ TEST_WORKSPACE_ID,
+ 'tarball',
+ ],
+ );
+
+ createdRegistrationIds.push(tarballId);
+
+ await insertCatalogRegistration({
+ universalIdentifier: curatedUid,
+ name: 'Data Enrichment',
+ sourcePackage: '@twentyhq/app-data-enrichment',
+ marketplaceDisplayData: {
+ icon: 'IconSparkles',
+ version: '1.0.0',
+ category: 'Data',
+ },
+ });
+ });
+
+ it('should return npm-sourced registrations from the database', async () => {
+ const res = await gqlRequest(MARKETPLACE_QUERY).expect(200);
+ const apps = res.body.data.findManyMarketplaceApps;
+
+ const testApp = apps.find((app: { id: string }) => app.id === npmUid);
+
+ expect(testApp).toBeDefined();
+ expect(testApp.name).toBe('Test Catalog App');
+ expect(testApp.sourcePackage).toBe('@test/catalog-app');
+ });
+
+ it('should not return tarball-sourced registrations', async () => {
+ const res = await gqlRequest(MARKETPLACE_QUERY).expect(200);
+ const apps = res.body.data.findManyMarketplaceApps;
+
+ const tarballApp = apps.find(
+ (app: { id: string }) => app.id === tarballUid,
+ );
+
+ expect(tarballApp).toBeUndefined();
+ });
+
+ it('should enrich curated apps with rich display data', async () => {
+ const res = await gqlRequest(MARKETPLACE_QUERY).expect(200);
+ const apps = res.body.data.findManyMarketplaceApps;
+
+ const curatedApp = apps.find(
+ (app: { id: string }) => app.id === curatedUid,
+ );
+
+ expect(curatedApp).toBeDefined();
+ expect(curatedApp.name).toBe('Data Enrichment');
+ expect(curatedApp.category).toBe('Data');
+ expect(curatedApp.icon).toBe('IconSparkles');
+ });
+ });
+
+ describe('installMarketplaceApp', () => {
+ it('should fail if registration does not exist', async () => {
+ const res = await gqlRequest(INSTALL_MUTATION, {
+ universalIdentifier: crypto.randomUUID(),
+ }).expect(200);
+
+ expect(res.body.errors).toBeDefined();
+ expect(res.body.errors[0].message).toContain(
+ 'No application registration found',
+ );
+ });
+ });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball-query-factory.util.ts
new file mode 100644
index 00000000000..aa90371c00e
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball-query-factory.util.ts
@@ -0,0 +1,21 @@
+import gql from 'graphql-tag';
+
+export const uploadAppTarballQueryFactory = ({
+ universalIdentifier,
+}: {
+ universalIdentifier?: string;
+}) => ({
+ query: gql`
+ mutation UploadAppTarball($file: Upload!, $universalIdentifier: String) {
+ uploadAppTarball(file: $file, universalIdentifier: $universalIdentifier) {
+ id
+ universalIdentifier
+ name
+ }
+ }
+ `,
+ variables: {
+ file: null,
+ universalIdentifier: universalIdentifier ?? null,
+ },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball.util.ts
new file mode 100644
index 00000000000..f1e0ffb9335
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/upload-app-tarball.util.ts
@@ -0,0 +1,56 @@
+import { uploadAppTarballQueryFactory } from 'test/integration/metadata/suites/application/utils/upload-app-tarball-query-factory.util';
+import { makeMetadataAPIRequestWithFileUpload } from 'test/integration/metadata/suites/utils/make-metadata-api-request-with-file-upload.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+type UploadAppTarballResult = {
+ id: string;
+ universalIdentifier: string;
+ name: string;
+};
+
+export const uploadAppTarball = async ({
+ tarballBuffer,
+ universalIdentifier,
+ expectToFail = false,
+ token,
+}: {
+ tarballBuffer: Buffer;
+ universalIdentifier?: string;
+ expectToFail?: boolean;
+ token?: string;
+}): CommonResponseBody<{
+ uploadAppTarball: UploadAppTarballResult;
+}> => {
+ const graphqlOperation = uploadAppTarballQueryFactory({
+ universalIdentifier,
+ });
+
+ const response = await makeMetadataAPIRequestWithFileUpload(
+ graphqlOperation,
+ {
+ field: 'file',
+ buffer: tarballBuffer,
+ filename: 'app.tar.gz',
+ contentType: 'application/gzip',
+ },
+ token,
+ );
+
+ if (expectToFail === true) {
+ warnIfNoErrorButExpectedToFail({
+ response,
+ errorMessage: 'Upload app tarball should have failed but did not',
+ });
+ }
+
+ if (expectToFail === false) {
+ warnIfErrorButNotExpectedToFail({
+ response,
+ errorMessage: 'Upload app tarball has failed but should not',
+ });
+ }
+
+ return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-shared/src/types/FileFolder.ts b/packages/twenty-shared/src/types/FileFolder.ts
index 6afa31565cc..ef78ba5215a 100644
--- a/packages/twenty-shared/src/types/FileFolder.ts
+++ b/packages/twenty-shared/src/types/FileFolder.ts
@@ -13,4 +13,5 @@ export enum FileFolder {
FilesField = 'files-field',
Dependencies = 'dependencies',
Workflow = 'workflow',
+ AppTarball = 'app-tarball',
}
diff --git a/yarn.lock b/yarn.lock
index 1811e2aa42b..c2d58015b2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8826,6 +8826,15 @@ __metadata:
languageName: node
linkType: hard
+"@isaacs/fs-minipass@npm:^4.0.0":
+ version: 4.0.1
+ resolution: "@isaacs/fs-minipass@npm:4.0.1"
+ dependencies:
+ minipass: "npm:^7.0.4"
+ checksum: 10c0/c25b6dc1598790d5b55c0947a9b7d111cfa92594db5296c3b907e2f533c033666f692a3939eadac17b1c7c40d362d0b0635dc874cbfe3e70db7c2b07cc97a5d2
+ languageName: node
+ linkType: hard
+
"@isaacs/string-locale-compare@npm:^1.0.1":
version: 1.1.0
resolution: "@isaacs/string-locale-compare@npm:1.1.0"
@@ -24998,6 +25007,15 @@ __metadata:
languageName: node
linkType: hard
+"@types/tar@npm:^7.0.87":
+ version: 7.0.87
+ resolution: "@types/tar@npm:7.0.87"
+ dependencies:
+ tar: "npm:*"
+ checksum: 10c0/23243d293a9ae2cae647f39d56587f24bca947409d75afe9d44987d07dabca9e64ef2f5cb6cb561e14b6c2e1990c420f9d67ba27c9f73d0becd33595ec6464a5
+ languageName: node
+ linkType: hard
+
"@types/tedious@npm:^4.0.14":
version: 4.0.14
resolution: "@types/tedious@npm:4.0.14"
@@ -31321,6 +31339,13 @@ __metadata:
languageName: node
linkType: hard
+"chownr@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "chownr@npm:3.0.0"
+ checksum: 10c0/43925b87700f7e3893296c8e9c56cc58f926411cce3a6e5898136daaf08f08b9a8eb76d37d3267e707d0dcc17aed2e2ebdf5848c0c3ce95cf910a919935c1b10
+ languageName: node
+ linkType: hard
+
"chromatic@npm:^13.3.3":
version: 13.3.5
resolution: "chromatic@npm:13.3.5"
@@ -46783,7 +46808,7 @@ __metadata:
languageName: node
linkType: hard
-"minipass@npm:^7.1.3":
+"minipass@npm:^7.0.4, minipass@npm:^7.1.3":
version: 7.1.3
resolution: "minipass@npm:7.1.3"
checksum: 10c0/539da88daca16533211ea5a9ee98dc62ff5742f531f54640dd34429e621955e91cc280a91a776026264b7f9f6735947629f920944e9c1558369e8bf22eb33fbb
@@ -46800,6 +46825,15 @@ __metadata:
languageName: node
linkType: hard
+"minizlib@npm:^3.1.0":
+ version: 3.1.0
+ resolution: "minizlib@npm:3.1.0"
+ dependencies:
+ minipass: "npm:^7.1.2"
+ checksum: 10c0/5aad75ab0090b8266069c9aabe582c021ae53eb33c6c691054a13a45db3b4f91a7fb1bd79151e6b4e9e9a86727b522527c0a06ec7d45206b745d54cd3097bcec
+ languageName: node
+ linkType: hard
+
"mintlify@npm:latest":
version: 4.2.179
resolution: "mintlify@npm:4.2.179"
@@ -56326,6 +56360,19 @@ __metadata:
languageName: node
linkType: hard
+"tar@npm:*, tar@npm:^7.5.9":
+ version: 7.5.10
+ resolution: "tar@npm:7.5.10"
+ dependencies:
+ "@isaacs/fs-minipass": "npm:^4.0.0"
+ chownr: "npm:^3.0.0"
+ minipass: "npm:^7.1.2"
+ minizlib: "npm:^3.1.0"
+ yallist: "npm:^5.0.0"
+ checksum: 10c0/ed905e4b33886377df6e9206e5d1bd34458c21666e27943f946799416f86348c938590d573d6a69312cb29c583b122647a64ec92782f2b7e24e68d985dd72531
+ languageName: node
+ linkType: hard
+
"tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.15, tar@npm:^6.1.2, tar@npm:^6.2.1":
version: 6.2.1
resolution: "tar@npm:6.2.1"
@@ -57479,6 +57526,7 @@ __metadata:
dotenv: "npm:^16.4.0"
esbuild: "npm:^0.25.0"
fast-glob: "npm:^3.3.0"
+ form-data: "npm:^4.0.5"
fs-extra: "npm:^11.2.0"
graphql: "npm:^16.8.1"
graphql-sse: "npm:^2.5.4"
@@ -57612,6 +57660,7 @@ __metadata:
"@types/pluralize": "npm:^0.0.33"
"@types/psl": "npm:^1.1.3"
"@types/react": "npm:^18.2.39"
+ "@types/tar": "npm:^7.0.87"
"@types/unzipper": "npm:^0"
"@yarnpkg/types": "npm:^4.0.0"
addressparser: "npm:1.0.1"
@@ -57707,6 +57756,7 @@ __metadata:
semver: "npm:7.6.3"
sharp: "npm:0.32.6"
stripe: "npm:19.3.1"
+ tar: "npm:^7.5.9"
temporal-polyfill: "npm:^0.3.0"
transliteration: "npm:2.3.5"
tsconfig-paths: "npm:^4.2.0"
@@ -61057,6 +61107,13 @@ __metadata:
languageName: node
linkType: hard
+"yallist@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "yallist@npm:5.0.0"
+ checksum: 10c0/a499c81ce6d4a1d260d4ea0f6d49ab4da09681e32c3f0472dee16667ed69d01dae63a3b81745a24bd78476ec4fcf856114cb4896ace738e01da34b2c42235416
+ languageName: node
+ linkType: hard
+
"yaml-ast-parser@npm:^0.0.43":
version: 0.0.43
resolution: "yaml-ast-parser@npm:0.0.43"