Skip to content

The open alternative to Salesforce, designed for AI.

Pin catalog sync to a registration's own source package (#25965)

Paul Rastoin613d3f6c5e94
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 45299a570be..39db714e6ea 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
@@ -5,7 +5,6 @@ import { isDefined } from 'twenty-shared/utils';
import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';
import { StaleRegistrationCleanupCronCommand } from 'src/engine/core-modules/application/application-oauth/stale-registration-cleanup/commands/stale-registration-cleanup.cron.command';
-import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';
import { ApplicationRecurringChargeCronCommand } from 'src/engine/core-modules/billing/app-billing/crons/commands/application-recurring-charge.cron.command';
import { BillingReminderCronCommand } from 'src/engine/core-modules/billing/reminders/crons/commands/billing-reminder.cron.command';
import { CheckEmailingDomainVerificationCronCommand } from 'src/engine/core-modules/emailing-domain/crons/commands/check-emailing-domain-verification.cron.command';
@@ -78,7 +77,6 @@ export class CronRegisterAllCommand extends CommandRunner {
private readonly enterpriseKeyValidationCronCommand: EnterpriseKeyValidationCronCommand,
private readonly rotateSigningKeysCronCommand: RotateSigningKeysCronCommand,
private readonly marketplaceCatalogSyncCronCommand: MarketplaceCatalogSyncCronCommand,
- private readonly applicationVersionCheckCronCommand: ApplicationVersionCheckCronCommand,
private readonly staleRegistrationCleanupCronCommand: StaleRegistrationCleanupCronCommand,
private readonly pendingFileCleanupCronCommand: PendingFileCleanupCronCommand,
private readonly billingReminderCronCommand: BillingReminderCronCommand,
@@ -204,10 +202,6 @@ export class CronRegisterAllCommand extends CommandRunner {
command: this.marketplaceCatalogSyncCronCommand,
isEnabled: isMarketplaceCatalogSyncEnabled,
},
- {
- name: 'ApplicationVersionCheck',
- command: this.applicationVersionCheckCronCommand,
- },
{
name: 'EnterpriseKeyValidation',
command: this.enterpriseKeyValidationCronCommand,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-apply.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-apply.service.ts
index 548dd44fdf0..db9cf11b919 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-apply.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-apply.service.ts
@@ -106,12 +106,15 @@ export class ApplicationManifestApplyService {
}
}
- return this.applicationRegistrationService.updateFromManifest({
- applicationRegistrationId,
- manifest,
- sourceType,
- latestAvailableVersion,
- preventVersionDowngrade,
- });
+ const manifestUpdate =
+ await this.applicationRegistrationService.updateFromManifest({
+ applicationRegistrationId,
+ manifest,
+ sourceType,
+ latestAvailableVersion,
+ preventVersionDowngrade,
+ });
+
+ return isDefined(manifestUpdate);
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant.ts
index 915c0adf3e2..15aff23eedc 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant.ts
@@ -2,27 +2,33 @@ import { TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS } from 'src/engine/core-modules
export const MARKETPLACE_VETTED_APPLICATIONS: {
universalIdentifier: string;
+ sourcePackage: string;
position?: number;
}[] = [
{
universalIdentifier: TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS.CALL_RECORDER,
+ sourcePackage: '@twentyhq/call-recorder',
position: 1,
},
{
universalIdentifier:
TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS.PEOPLE_DATA_LABS,
+ sourcePackage: '@twentyhq/people-data-labs',
position: 2,
},
{
universalIdentifier: TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS.LAST_CONTACT,
+ sourcePackage: '@twentyhq/last-contact',
position: 3,
},
{
universalIdentifier: TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS.EXA,
+ sourcePackage: '@twentyhq/exa',
position: 4,
},
{
universalIdentifier: TWENTY_PUBLIC_APP_UNIVERSAL_IDENTIFIERS.SLACK,
+ sourcePackage: '@twentyhq/slack',
position: 5,
},
];
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts
index 1de8839d225..e96e402f94b 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts
@@ -1,6 +1,6 @@
import { Injectable, Logger } from '@nestjs/common';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isValidUuid } from 'twenty-shared/utils';
import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';
import { ApplicationRegistrationAssetService } from 'src/engine/core-modules/application/application-registration/application-registration-asset.service';
@@ -46,25 +46,28 @@ export class MarketplaceCatalogSyncService {
const universalIdentifier =
fetchedManifest.application.universalIdentifier;
+ if (!isValidUuid(universalIdentifier)) {
+ this.logger.warn(
+ `Skipping ${pkg.name}: universal identifier ${universalIdentifier} is not a valid UUID`,
+ );
+ continue;
+ }
+
const previousVersion = (
await this.applicationRegistrationService.findOneByUniversalIdentifierGlobal(
universalIdentifier,
)
)?.latestAvailableVersion;
- await this.applicationRegistrationService.upsertFromCatalog({
- universalIdentifier,
- name: fetchedManifest.application.displayName ?? pkg.name,
- sourceType: ApplicationRegistrationSourceType.NPM,
- sourcePackage: pkg.name,
- latestAvailableVersion: pkg.version ?? null,
- manifest: fetchedManifest,
- });
-
const registration =
- await this.applicationRegistrationService.findOneByUniversalIdentifierGlobal(
+ await this.applicationRegistrationService.upsertFromCatalog({
universalIdentifier,
- );
+ name: fetchedManifest.application.displayName ?? pkg.name,
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: pkg.name,
+ latestAvailableVersion: pkg.version ?? null,
+ manifest: fetchedManifest,
+ });
if (!isDefined(registration)) {
continue;
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts
index f400ef6ff10..83adf7c67b5 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts
@@ -1,6 +1,8 @@
import { Test, type TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
+import { type Manifest } from 'twenty-shared/application';
+
import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.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';
@@ -22,7 +24,6 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {
findOne: jest.Mock;
save: jest.Mock;
create: jest.Mock;
- createQueryBuilder: jest.Mock;
};
const catalogParams = {
@@ -31,7 +32,11 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {
sourceType: ApplicationRegistrationSourceType.NPM,
sourcePackage: 'twenty-app-my-app',
latestAvailableVersion: '0.2.0',
- manifest: null,
+ manifest: {
+ application: {
+ universalIdentifier: '97141c95-2870-5662-8992-44fb6536be9a',
+ },
+ } as unknown as Manifest,
};
const buildExistingRegistration = (
@@ -50,13 +55,6 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {
findOne: jest.fn(),
save: jest.fn(),
create: jest.fn((entity) => entity),
- createQueryBuilder: jest.fn(() => ({
- update: jest.fn().mockReturnThis(),
- set: jest.fn().mockReturnThis(),
- where: jest.fn().mockReturnThis(),
- andWhere: jest.fn().mockReturnThis(),
- execute: jest.fn().mockResolvedValue({ affected: 0 }),
- })),
};
const module: TestingModule = await Test.createTestingModule({
@@ -118,52 +116,125 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {
jest.clearAllMocks();
});
- it('should re-list a registration first created by a local install when the catalog serves it', async () => {
- applicationRegistrationRepository.findOne.mockResolvedValue(
- buildExistingRegistration({
- sourceType: ApplicationRegistrationSourceType.TARBALL,
+ it.each([
+ ApplicationRegistrationSourceType.LOCAL,
+ ApplicationRegistrationSourceType.TARBALL,
+ ApplicationRegistrationSourceType.OAUTH_ONLY,
+ ])(
+ 'should not attach the catalog to a registration created from source %s',
+ async (sourceType) => {
+ const existingRegistration = buildExistingRegistration({
+ sourceType,
isListed: false,
- }),
+ });
+
+ applicationRegistrationRepository.findOne.mockResolvedValue(
+ existingRegistration,
+ );
+
+ const updateFromManifestSpy = jest
+ .spyOn(service, 'updateFromManifest')
+ .mockResolvedValue({
+ registration: existingRegistration,
+ isNewerVersion: false,
+ });
+
+ await service.upsertFromCatalog(catalogParams);
+
+ expect(applicationRegistrationRepository.save).not.toHaveBeenCalled();
+ expect(updateFromManifestSpy).not.toHaveBeenCalled();
+ },
+ );
+
+ it('should leave the operator listing and vetting choices untouched on update', async () => {
+ const existingRegistration = buildExistingRegistration({
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ isListed: false,
+ });
+
+ applicationRegistrationRepository.findOne.mockResolvedValue(
+ existingRegistration,
);
+ const updateFromManifestSpy = jest
+ .spyOn(service, 'updateFromManifest')
+ .mockResolvedValue({
+ registration: existingRegistration,
+ isNewerVersion: false,
+ });
- await service.upsertFromCatalog(catalogParams);
+ const result = await service.upsertFromCatalog(catalogParams);
- expect(applicationRegistrationRepository.save).toHaveBeenCalledWith(
+ expect(result).toBe(existingRegistration);
+ expect(updateFromManifestSpy).toHaveBeenCalledWith(
expect.objectContaining({
- isListed: true,
- sourceType: ApplicationRegistrationSourceType.NPM,
+ preventVersionDowngrade: true,
+ additionalFields: {
+ name: catalogParams.name,
+ sourcePackage: catalogParams.sourcePackage,
+ },
}),
);
});
- it('should preserve an operator delisting of a registry-sourced registration', async () => {
+ it.each([true, false])(
+ 'should enqueue auto-upgrades only when the manifest update reports a newer version (%s)',
+ async (isNewerVersion) => {
+ const existingRegistration = buildExistingRegistration({
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ });
+
+ applicationRegistrationRepository.findOne.mockResolvedValue(
+ existingRegistration,
+ );
+ jest.spyOn(service, 'updateFromManifest').mockResolvedValue({
+ registration: existingRegistration,
+ isNewerVersion,
+ });
+ const enqueueAutoUpgradeApplicationsSpy = jest
+ .spyOn(service, 'enqueueAutoUpgradeApplications')
+ .mockResolvedValue();
+
+ await service.upsertFromCatalog(catalogParams);
+
+ expect(enqueueAutoUpgradeApplicationsSpy).toHaveBeenCalledTimes(
+ isNewerVersion ? 1 : 0,
+ );
+ },
+ );
+
+ it('should skip the catalog entry when the manifest update refuses a downgrade', async () => {
applicationRegistrationRepository.findOne.mockResolvedValue(
buildExistingRegistration({
sourceType: ApplicationRegistrationSourceType.NPM,
- isListed: false,
+ latestAvailableVersion: '1.0.0',
}),
);
+ jest.spyOn(service, 'updateFromManifest').mockResolvedValue(null);
- await service.upsertFromCatalog(catalogParams);
+ const result = await service.upsertFromCatalog({
+ ...catalogParams,
+ latestAvailableVersion: '0.9.0',
+ });
- expect(applicationRegistrationRepository.save).toHaveBeenCalledWith(
- expect.objectContaining({ isListed: false }),
- );
+ expect(result).toBeNull();
});
- it('should keep an already listed registration listed', async () => {
+ it('should not erase a known version when the catalog entry has none', async () => {
applicationRegistrationRepository.findOne.mockResolvedValue(
buildExistingRegistration({
sourceType: ApplicationRegistrationSourceType.NPM,
- isListed: true,
+ latestAvailableVersion: '1.0.0',
}),
);
+ const updateFromManifestSpy = jest.spyOn(service, 'updateFromManifest');
- await service.upsertFromCatalog(catalogParams);
+ const result = await service.upsertFromCatalog({
+ ...catalogParams,
+ latestAvailableVersion: null,
+ });
- expect(applicationRegistrationRepository.save).toHaveBeenCalledWith(
- expect.objectContaining({ isListed: true }),
- );
+ expect(result).toBeNull();
+ expect(updateFromManifestSpy).not.toHaveBeenCalled();
});
it('should create new catalog registrations as listed', async () => {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
index 8fd80375deb..8bd00239ccb 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
@@ -7,7 +7,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import * as bcrypt from 'bcrypt';
import isEqual from 'lodash.isequal';
import { type Manifest } from 'twenty-shared/application';
-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+import { isDefined, isNonEmptyArray, isValidUuid } from 'twenty-shared/utils';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
import { IsNull, type FindOptionsWhere, type Repository } from 'typeorm';
import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
@@ -41,8 +41,8 @@ import {
} from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';
import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
import { buildRegistrationManifestUpdateFields } from 'src/engine/core-modules/application/application-registration/utils/build-registration-manifest-update-fields.util';
-import { serializeApplicationRegistrationForBroadcast } from 'src/engine/core-modules/application/application-registration/utils/serialize-application-registration-for-broadcast.util';
import { fromManifestApplicationToDisplayFields } from 'src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util';
+import { serializeApplicationRegistrationForBroadcast } from 'src/engine/core-modules/application/application-registration/utils/serialize-application-registration-for-broadcast.util';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import {
ApplicationException,
@@ -54,10 +54,10 @@ import {
} from 'src/engine/core-modules/application/jobs/upgrade-applications.job-constants';
import { validateRedirectUri } from 'src/engine/core-modules/auth/utils/validate-redirect-uri.util';
import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
+import { ServerFileStorageService } from 'src/engine/core-modules/file-storage/services/server-file-storage.service';
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';
-import { ServerFileStorageService } from 'src/engine/core-modules/file-storage/services/server-file-storage.service';
import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -108,6 +108,15 @@ const APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT: (keyof ApplicationRegist
'updatedAt',
];
+export type UpsertApplicationRegistrationFromCatalogParams = {
+ universalIdentifier: string;
+ name: string;
+ sourceType: ApplicationRegistrationSourceType;
+ sourcePackage: string;
+ latestAvailableVersion: string | null;
+ manifest: Manifest;
+};
+
export type ApplicationRegistrationCatalogCard = {
id: string;
universalIdentifier: string;
@@ -279,32 +288,6 @@ export class ApplicationRegistrationService {
});
}
- async setLatestAvailableVersionIfChanged(
- applicationRegistrationId: string,
- newVersion: string | null,
- { shouldBroadcastUpdate = true }: { shouldBroadcastUpdate?: boolean } = {},
- ): Promise<boolean> {
- const result = await this.applicationRegistrationRepository
- .createQueryBuilder()
- .update(ApplicationRegistrationEntity)
- .set({ latestAvailableVersion: newVersion })
- .where('id = :id', { id: applicationRegistrationId })
- .andWhere('"latestAvailableVersion" IS DISTINCT FROM :newVersion', {
- newVersion,
- })
- .execute();
-
- const hasChanged = (result.affected ?? 0) > 0;
-
- if (hasChanged && shouldBroadcastUpdate) {
- await this.broadcastApplicationRegistrationUpdatedById(
- applicationRegistrationId,
- );
- }
-
- return hasChanged;
- }
-
async findMany(
ownerWorkspaceId: string,
): Promise<ApplicationRegistrationEntity[]> {
@@ -691,7 +674,10 @@ export class ApplicationRegistrationService {
| 'ownerWorkspaceId'
>
>;
- }): Promise<boolean> {
+ }): Promise<{
+ registration: ApplicationRegistrationEntity;
+ isNewerVersion: boolean;
+ } | null> {
return this.cacheLockService.withLock(
async () => {
const existing =
@@ -699,21 +685,29 @@ export class ApplicationRegistrationService {
where: { id: applicationRegistrationId },
});
- if (
- preventVersionDowngrade &&
+ const isSameOrNewerVersion =
isDefined(latestAvailableVersion) &&
- !shouldRefreshApplicationRegistrationOnInstall({
+ shouldRefreshApplicationRegistrationOnInstall({
installedVersion: latestAvailableVersion,
latestAvailableVersion: existing.latestAvailableVersion,
- })
+ });
+
+ if (
+ preventVersionDowngrade &&
+ isDefined(latestAvailableVersion) &&
+ !isSameOrNewerVersion
) {
this.logger.log(
`Skipping registration update for ${existing.universalIdentifier}: version ${latestAvailableVersion} is older than latest available version ${existing.latestAvailableVersion}`,
);
- return false;
+ return null;
}
+ const isNewerVersion =
+ isSameOrNewerVersion &&
+ latestAvailableVersion !== existing.latestAvailableVersion;
+
const manifestUpdateFields = buildRegistrationManifestUpdateFields({
manifestApplication: manifest.application,
existingGalleryImages: existing.galleryImages,
@@ -723,6 +717,22 @@ export class ApplicationRegistrationService {
const hasLogoPathChanged =
(manifestUpdateFields.logo ?? null) !== (existing.logo ?? null);
+ const updateFields = {
+ name: manifest.application?.displayName ?? existing.name,
+ manifest,
+ ...manifestUpdateFields,
+ ...(hasLogoPathChanged && { logoFileId: null }),
+ ...(sourceType !== undefined && { sourceType }),
+ ...(latestAvailableVersion !== undefined && {
+ latestAvailableVersion,
+ }),
+ ...additionalFields,
+ };
+
+ // TypeORM's deep partial type cannot represent the manifest JSON column.
+ const updatePayload =
+ updateFields as QueryDeepPartialEntity<ApplicationRegistrationEntity>;
+
// Partial update in one transaction: the row and its variable schemas
// stay on the same manifest without clobbering columns written by
// flows outside this lock.
@@ -730,17 +740,7 @@ export class ApplicationRegistrationService {
async (entityManager) => {
await entityManager
.getRepository(ApplicationRegistrationEntity)
- .update(applicationRegistrationId, {
- name: manifest.application?.displayName ?? existing.name,
- manifest,
- ...manifestUpdateFields,
- ...(hasLogoPathChanged && { logoFileId: null }),
- ...(sourceType !== undefined && { sourceType }),
- ...(latestAvailableVersion !== undefined && {
- latestAvailableVersion,
- }),
- ...additionalFields,
- } as QueryDeepPartialEntity<ApplicationRegistrationEntity>);
+ .update(applicationRegistrationId, updatePayload);
if (isDefined(manifest.application?.serverVariables)) {
await this.applicationRegistrationVariableService.syncVariableSchemas(
@@ -759,7 +759,10 @@ export class ApplicationRegistrationService {
registrationBeforeUpdate ?? existing,
);
- return true;
+ return {
+ registration: { ...existing, ...updateFields },
+ isNewerVersion,
+ };
},
`application-registration-update:${applicationRegistrationId}`,
APPLICATION_REGISTRATION_UPDATE_LOCK_OPTIONS,
@@ -825,102 +828,115 @@ export class ApplicationRegistrationService {
}
async upsertFromCatalog(
- params: Pick<
- ApplicationRegistrationEntity,
- | 'universalIdentifier'
- | 'name'
- | 'sourceType'
- | 'sourcePackage'
- | 'latestAvailableVersion'
- | 'manifest'
- >,
- ): Promise<void> {
+ rawParams: UpsertApplicationRegistrationFromCatalogParams,
+ ): Promise<ApplicationRegistrationEntity | null> {
+ if (!isValidUuid(rawParams.universalIdentifier)) {
+ this.logger.warn(
+ `Skipping catalog entry from package ${rawParams.sourcePackage}: universal identifier ${rawParams.universalIdentifier} is not a valid UUID`,
+ );
+
+ return null;
+ }
+
+ const params = {
+ ...rawParams,
+ universalIdentifier: rawParams.universalIdentifier.toLowerCase(),
+ };
+
const existing = await this.findOneByUniversalIdentifierGlobal(
params.universalIdentifier,
);
- if (isDefined(existing) && isDefined(params.manifest)) {
- const isNewVersion = await this.setLatestAvailableVersionIfChanged(
- existing.id,
- params.latestAvailableVersion ?? null,
- { shouldBroadcastUpdate: false },
+ if (
+ isDefined(existing) &&
+ existing.sourceType !== ApplicationRegistrationSourceType.NPM
+ ) {
+ this.logger.warn(
+ `Skipping catalog entry from package ${params.sourcePackage}: universal identifier ${params.universalIdentifier} is registered from source ${existing.sourceType}`,
);
- await this.updateFromManifest({
- applicationRegistrationId: existing.id,
- manifest: params.manifest,
- sourceType: params.sourceType,
- latestAvailableVersion: params.latestAvailableVersion,
- registrationBeforeUpdate: existing,
- additionalFields: {
- name: params.name,
- sourcePackage: params.sourcePackage,
- },
- });
+ return null;
+ }
- if (isNewVersion) {
- this.emitRegistrationPublishMetric({
- isNewRegistration: false,
- universalIdentifier: params.universalIdentifier,
- name: params.name,
- sourceType: params.sourceType,
- version: params.latestAvailableVersion,
- });
+ const officialSourcePackage = MARKETPLACE_VETTED_APPLICATIONS.find(
+ ({ universalIdentifier }) =>
+ universalIdentifier === params.universalIdentifier,
+ )?.sourcePackage;
- await this.enqueueAutoUpgradeApplications(existing.id);
- }
+ const expectedSourcePackage =
+ officialSourcePackage ?? existing?.sourcePackage;
- return;
+ if (
+ isDefined(expectedSourcePackage) &&
+ expectedSourcePackage !== params.sourcePackage
+ ) {
+ this.logger.warn(
+ `Skipping catalog entry from package ${params.sourcePackage}: universal identifier ${params.universalIdentifier} belongs to package ${expectedSourcePackage}`,
+ );
+
+ return null;
}
if (isDefined(existing)) {
- const isNewVersion = await this.setLatestAvailableVersionIfChanged(
- existing.id,
- params.latestAvailableVersion ?? null,
- { shouldBroadcastUpdate: false },
+ return this.updateFromCatalog(existing, params);
+ }
+
+ return this.createFromCatalog(params, {
+ isVetted: isDefined(officialSourcePackage),
+ });
+ }
+
+ private async updateFromCatalog(
+ existing: ApplicationRegistrationEntity,
+ params: UpsertApplicationRegistrationFromCatalogParams,
+ ): Promise<ApplicationRegistrationEntity | null> {
+ if (
+ !isDefined(params.latestAvailableVersion) &&
+ isDefined(existing.latestAvailableVersion)
+ ) {
+ this.logger.warn(
+ `Skipping catalog entry from package ${params.sourcePackage}: no version for universal identifier ${params.universalIdentifier} while ${existing.latestAvailableVersion} is already known`,
);
- // A registration first created by a local install (CLI dev / tarball
- // upload) starts unlisted on purpose. Once the catalog source serves the
- // same universalIdentifier, surface it in the marketplace — while
- // preserving an operator's decision to delist a registry-sourced app.
- const isRelistedFromLocalSource =
- existing.sourceType === ApplicationRegistrationSourceType.TARBALL ||
- existing.sourceType === ApplicationRegistrationSourceType.LOCAL;
+ return null;
+ }
- await this.applicationRegistrationRepository.save({
- ...existing,
+ const manifestUpdate = await this.updateFromManifest({
+ applicationRegistrationId: existing.id,
+ manifest: params.manifest,
+ sourceType: params.sourceType,
+ latestAvailableVersion: params.latestAvailableVersion,
+ preventVersionDowngrade: true,
+ registrationBeforeUpdate: existing,
+ additionalFields: {
name: params.name,
- sourceType: params.sourceType,
sourcePackage: params.sourcePackage,
- latestAvailableVersion: params.latestAvailableVersion,
- isListed: existing.isListed || isRelistedFromLocalSource,
- manifest: params.manifest,
- ...fromManifestApplicationToDisplayFields(params.manifest?.application),
- });
-
- await this.invalidateMarketplaceAppsCache();
-
- await this.broadcastApplicationRegistrationUpdatedById(
- existing.id,
- existing,
- );
+ },
+ });
- if (isNewVersion) {
- this.emitRegistrationPublishMetric({
- isNewRegistration: false,
- universalIdentifier: params.universalIdentifier,
- name: params.name,
- sourceType: params.sourceType,
- version: params.latestAvailableVersion,
- });
+ if (!isDefined(manifestUpdate)) {
+ return null;
+ }
- await this.enqueueAutoUpgradeApplications(existing.id);
- }
+ if (manifestUpdate.isNewerVersion) {
+ this.emitRegistrationPublishMetric({
+ isNewRegistration: false,
+ universalIdentifier: params.universalIdentifier,
+ name: params.name,
+ sourceType: params.sourceType,
+ version: params.latestAvailableVersion,
+ });
- return;
+ await this.enqueueAutoUpgradeApplications(existing.id);
}
+ return manifestUpdate.registration;
+ }
+
+ private async createFromCatalog(
+ params: UpsertApplicationRegistrationFromCatalogParams,
+ { isVetted }: { isVetted: boolean },
+ ): Promise<ApplicationRegistrationEntity> {
const registration = this.applicationRegistrationRepository.create({
universalIdentifier: params.universalIdentifier,
name: params.name,
@@ -928,12 +944,9 @@ export class ApplicationRegistrationService {
sourcePackage: params.sourcePackage,
latestAvailableVersion: params.latestAvailableVersion,
isListed: true,
- isVetted: MARKETPLACE_VETTED_APPLICATIONS.some(
- ({ universalIdentifier }) =>
- universalIdentifier === params.universalIdentifier,
- ),
+ isVetted,
manifest: params.manifest,
- ...fromManifestApplicationToDisplayFields(params.manifest?.application),
+ ...fromManifestApplicationToDisplayFields(params.manifest.application),
oAuthClientId: v4(),
oAuthRedirectUris: [],
oAuthScopes: [],
@@ -952,14 +965,14 @@ export class ApplicationRegistrationService {
await this.invalidateMarketplaceAppsCache();
- if (!isDefined(params.manifest?.application?.serverVariables)) {
- return;
+ if (isDefined(params.manifest.application.serverVariables)) {
+ await this.applicationRegistrationVariableService.syncVariableSchemas(
+ registration.id,
+ params.manifest.application.serverVariables,
+ );
}
- await this.applicationRegistrationVariableService.syncVariableSchemas(
- registration.id,
- params.manifest.application.serverVariables,
- );
+ return registration;
}
async createCliRegistrationIfNotExists(): Promise<ApplicationRegistrationEntity | null> {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts
index 950f08696ee..288471c5484 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts
@@ -9,8 +9,6 @@ import { ApplicationRegistrationModule } from 'src/engine/core-modules/applicati
import { ApplicationUpgradeResolver } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.resolver';
import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';
import { UpgradeApplicationCommand } from 'src/engine/core-modules/application/application-upgrade/commands/upgrade-application.command';
-import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';
-import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';
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 { WorkspaceVersionModule } from 'src/engine/workspace-manager/workspace-version/workspace-version.module';
@@ -23,6 +21,9 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
ApplicationRegistrationEntity,
]),
ApplicationInstallModule,
+ // Nothing here injects from these two modules any more, but the generated
+ // metadata GraphQL schema follows Nest's module registration order, so
+ // dropping them reorders the checked-in client schema.
ApplicationRegistrationModule,
FeatureFlagModule,
PermissionsModule,
@@ -33,10 +34,8 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
providers: [
ApplicationUpgradeService,
ApplicationUpgradeResolver,
- ApplicationVersionCheckCronJob,
- ApplicationVersionCheckCronCommand,
UpgradeApplicationCommand,
],
- exports: [ApplicationUpgradeService, ApplicationVersionCheckCronCommand],
+ exports: [ApplicationUpgradeService],
})
export class ApplicationUpgradeModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
index 82d86e63ecc..2947bd8f8d1 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
@@ -1,10 +1,8 @@
import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
-import axios from 'axios';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { In, Repository } from 'typeorm';
-import { z } from 'zod';
import {
WorkspaceIteratorService,
@@ -12,20 +10,14 @@ import {
} from 'src/database/commands/command-runners/workspace-iterator.service';
import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.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 { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-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 { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { WorkspaceVersionService } from 'src/engine/workspace-manager/workspace-version/services/workspace-version.service';
-const npmPackageMetadataSchema = z.object({
- version: z.string(),
-});
-
@Injectable()
export class ApplicationUpgradeService {
private readonly logger = new Logger(ApplicationUpgradeService.name);
@@ -36,86 +28,10 @@ export class ApplicationUpgradeService {
@InjectRepository(ApplicationEntity)
private readonly applicationRepository: Repository<ApplicationEntity>,
private readonly applicationInstallService: ApplicationInstallService,
- private readonly applicationRegistrationService: ApplicationRegistrationService,
- private readonly twentyConfigService: TwentyConfigService,
private readonly workspaceIteratorService: WorkspaceIteratorService,
private readonly workspaceVersionService: WorkspaceVersionService,
) {}
- async checkForUpdates(
- appRegistration: ApplicationRegistrationEntity,
- ): Promise<string | null> {
- if (appRegistration.sourceType !== ApplicationRegistrationSourceType.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;
- }
-
- const isNewVersion =
- await this.applicationRegistrationService.setLatestAvailableVersionIfChanged(
- appRegistration.id,
- parsed.data.version,
- );
-
- if (isNewVersion) {
- this.applicationRegistrationService.emitRegistrationPublishMetric({
- isNewRegistration: false,
- universalIdentifier: appRegistration.universalIdentifier,
- name: appRegistration.name,
- sourceType: appRegistration.sourceType,
- version: parsed.data.version,
- });
-
- await this.applicationRegistrationService.enqueueAutoUpgradeApplications(
- appRegistration.id,
- );
- }
-
- 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: ApplicationRegistrationSourceType.NPM },
- });
-
- for (const registration of npmRegistrations) {
- await this.checkForUpdates(registration);
- }
- }
-
async findApplicationsToUpgrade({
applicationRegistrationId,
onlyAutoUpgrade = false,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.ts
deleted file mode 100644
index 3d2f2882adb..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
-import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';
-import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';
-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 ApplicationVersionCheckCronJob {
- private readonly logger = new Logger(ApplicationVersionCheckCronJob.name);
-
- constructor(
- private readonly applicationUpgradeService: ApplicationUpgradeService,
- ) {}
-
- @Process(ApplicationVersionCheckCronJob.name)
- @SentryCronMonitor(
- ApplicationVersionCheckCronJob.name,
- APPLICATION_VERSION_CHECK_CRON_PATTERN,
- )
- async handle(): Promise<void> {
- this.logger.log('Starting application version check...');
-
- try {
- await this.applicationUpgradeService.checkAllForUpdates();
- this.logger.log('Application version check completed successfully');
- } catch (error) {
- this.logger.error(
- `Application version check failed: ${error instanceof Error ? error.message : String(error)}`,
- );
- throw error;
- }
- }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.ts
deleted file mode 100644
index f8d45ba9854..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Command, CommandRunner } from 'nest-commander';
-
-import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';
-import { APPLICATION_VERSION_CHECK_CRON_PATTERN } from 'src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant';
-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 ApplicationVersionCheckCronCommand extends CommandRunner {
- constructor(
- @InjectMessageQueue(MessageQueue.cronQueue)
- private readonly messageQueueService: MessageQueueService,
- ) {
- super();
- }
-
- async run(): Promise<void> {
- await this.messageQueueService.addCron<undefined>({
- jobName: ApplicationVersionCheckCronJob.name,
- data: undefined,
- options: {
- repeat: {
- pattern: APPLICATION_VERSION_CHECK_CRON_PATTERN,
- },
- },
- });
- }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.ts
deleted file mode 100644
index bf8fbebcaeb..00000000000
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/crons/constants/application-version-check-cron-pattern.constant.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Every 6 hours
-export const APPLICATION_VERSION_CHECK_CRON_PATTERN = '0 */6 * * *';
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
index e2f5a243435..0b7e6039c91 100644
--- 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
@@ -8,6 +8,10 @@ import request from 'supertest';
import * as tar from 'tar';
import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';
import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
+import { findApplicationRegistrationByUniversalIdentifier } from 'test/integration/metadata/suites/application/utils/find-application-registration-by-universal-identifier.util';
+import { insertCatalogApplicationRegistration } from 'test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util';
+import { syncMarketplaceCatalogFromRegistryPackage } from 'test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util';
+import { upsertApplicationRegistrationFromCatalog } from 'test/integration/metadata/suites/application/utils/upsert-application-registration-from-catalog.util';
import { makeAdminPanelAPIRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { type DataSource } from 'typeorm';
@@ -69,40 +73,10 @@ describe('Marketplace Catalog Sync (integration)', () => {
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
.send({ query, variables });
- const insertCatalogRegistration = async (params: {
- universalIdentifier: string;
- name: string;
- sourcePackage: string;
- latestAvailableVersion?: string;
- manifest?: Record<string, unknown>;
- category?: 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", "latestAvailableVersion",
- "manifest", "isListed", "category")
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`,
- [
- id,
- params.universalIdentifier,
- params.name,
- oAuthClientId,
- [],
- [],
- TEST_WORKSPACE_ID,
- 'npm',
- params.sourcePackage,
- params.latestAvailableVersion ?? '1.0.0',
- params.manifest ? JSON.stringify(params.manifest) : null,
- true,
- params.category ?? null,
- ],
- );
+ const insertCatalogRegistration = async (
+ params: Parameters<typeof insertCatalogApplicationRegistration>[0],
+ ): Promise<string> => {
+ const id = await insertCatalogApplicationRegistration(params);
createdRegistrationIds.push(id);
@@ -195,102 +169,556 @@ describe('Marketplace Catalog Sync (integration)', () => {
});
});
- describe.each([true, false])(
- 'catalog sync with manifest: %s',
- (hasManifest) => {
- it.each([true, false])(
- 'preserves the admin choice isVetted=%s',
- async (isVetted) => {
- const applicationRegistrationService =
- getAppProviderByClassName<ApplicationRegistrationService>(
- 'ApplicationRegistrationService',
+ describe('catalog sync', () => {
+ it.each([true, false])(
+ 'preserves the admin choice isVetted=%s',
+ async (isVetted) => {
+ const applicationRegistrationService =
+ getAppProviderByClassName<ApplicationRegistrationService>(
+ 'ApplicationRegistrationService',
+ );
+ const universalIdentifier = isVetted
+ ? crypto.randomUUID()
+ : MARKETPLACE_VETTED_APPLICATIONS[0].universalIdentifier;
+ const catalogParams = {
+ universalIdentifier,
+ name: 'Vetted catalog sync test',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: isVetted
+ ? '@test/vetted-catalog-sync'
+ : MARKETPLACE_VETTED_APPLICATIONS[0].sourcePackage,
+ latestAvailableVersion: '1.0.0',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ };
+
+ expect(
+ await applicationRegistrationService.findOneByUniversalIdentifierGlobal(
+ universalIdentifier,
+ ),
+ ).toBeNull();
+
+ try {
+ await applicationRegistrationService.upsertFromCatalog(catalogParams);
+
+ const registration =
+ await applicationRegistrationService.findOneByUniversalIdentifierGlobal(
+ universalIdentifier,
);
- const universalIdentifier = isVetted
- ? crypto.randomUUID()
- : MARKETPLACE_VETTED_APPLICATIONS[0].universalIdentifier;
- const catalogParams = {
+
+ expect(registration).toMatchObject({ isVetted: !isVetted });
+
+ const updateResponse = await makeAdminPanelAPIRequest({
+ query: gql`
+ mutation UpdateAdminApplicationRegistration(
+ $input: AdminUpdateApplicationRegistrationInput!
+ ) {
+ updateAdminApplicationRegistration(input: $input) {
+ id
+ isVetted
+ }
+ }
+ `,
+ variables: {
+ input: { id: registration?.id, update: { isVetted } },
+ },
+ });
+
+ expect(updateResponse.body.errors).toBeUndefined();
+ expect(
+ updateResponse.body.data.updateAdminApplicationRegistration,
+ ).toMatchObject({ isVetted });
+
+ await applicationRegistrationService.upsertFromCatalog(catalogParams);
+
+ const refreshedResponse = await makeAdminPanelAPIRequest({
+ query: gql`
+ query FindOneAdminApplicationRegistration($id: String!) {
+ findOneAdminApplicationRegistration(id: $id) {
+ id
+ isVetted
+ }
+ }
+ `,
+ variables: { id: registration?.id },
+ });
+
+ expect(refreshedResponse.body.errors).toBeUndefined();
+ expect(
+ refreshedResponse.body.data.findOneAdminApplicationRegistration,
+ ).toMatchObject({ isVetted });
+ } finally {
+ await ds.query(
+ `DELETE FROM core."applicationRegistration" WHERE "universalIdentifier" = $1`,
+ [universalIdentifier],
+ );
+ }
+ },
+ );
+ });
+
+ describe('catalog sync source package pinning', () => {
+ const OFFICIAL_APPLICATION = MARKETPLACE_VETTED_APPLICATIONS[0];
+
+ it('does not let another package overwrite an existing registration', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ });
+
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier,
+ name: 'Squatted App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@test/squatter-app',
+ latestAvailableVersion: '9.9.9',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ latestAvailableVersion: '1.0.0',
+ });
+ });
+
+ it('does not attach a package to a registration created from a local install', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Dev Mode App',
+ sourceType: ApplicationRegistrationSourceType.LOCAL,
+ });
+
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier,
+ name: 'Squatted App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@test/squatter-app',
+ latestAvailableVersion: '9.9.9',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Dev Mode App',
+ sourcePackage: null,
+ latestAvailableVersion: '1.0.0',
+ });
+ });
+
+ it('keeps updating an existing registration from its own package', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ });
+
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@test/pinned-app',
+ latestAvailableVersion: '2.0.0',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ sourcePackage: '@test/pinned-app',
+ latestAvailableVersion: '2.0.0',
+ });
+ });
+
+ it('does not register an official identifier from a non-official package', async () => {
+ const { universalIdentifier } = OFFICIAL_APPLICATION;
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toBeNull();
+
+ try {
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier,
+ name: 'Squatted Official App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@test/squatter-app',
+ latestAvailableVersion: '1.0.0',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toBeNull();
+ } finally {
+ await cleanupApplicationAndAppRegistration({
+ applicationUniversalIdentifier: universalIdentifier,
+ });
+ }
+ });
+
+ it.each([
+ {
+ variant: 'uppercase',
+ transform: (universalIdentifier: string) =>
+ universalIdentifier.toUpperCase(),
+ },
+ {
+ variant: 'hyphenless',
+ transform: (universalIdentifier: string) =>
+ universalIdentifier.replace(/-/g, ''),
+ },
+ ])(
+ 'does not register an official identifier spelled $variant from a non-official package',
+ async ({ transform }) => {
+ const { universalIdentifier } = OFFICIAL_APPLICATION;
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
universalIdentifier,
- name: 'Vetted catalog sync test',
+ }),
+ ).toBeNull();
+
+ try {
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier: transform(universalIdentifier),
+ name: 'Squatted Official App',
sourceType: ApplicationRegistrationSourceType.NPM,
- sourcePackage: '@test/vetted-catalog-sync',
+ sourcePackage: '@test/squatter-app',
latestAvailableVersion: '1.0.0',
- manifest: hasManifest
- ? buildBaseManifest({
- appId: universalIdentifier,
- roleId: crypto.randomUUID(),
- })
- : null,
- };
+ manifest: buildBaseManifest({
+ appId: transform(universalIdentifier),
+ roleId: crypto.randomUUID(),
+ }),
+ });
expect(
- await applicationRegistrationService.findOneByUniversalIdentifierGlobal(
+ await findApplicationRegistrationByUniversalIdentifier({
universalIdentifier,
- ),
+ }),
).toBeNull();
+ } finally {
+ await cleanupApplicationAndAppRegistration({
+ applicationUniversalIdentifier: universalIdentifier,
+ });
+ }
+ },
+ );
- try {
- await applicationRegistrationService.upsertFromCatalog(
- catalogParams,
- );
+ it('does not let another package overwrite an existing registration through an uppercase identifier', async () => {
+ const universalIdentifier = crypto.randomUUID();
- const registration =
- await applicationRegistrationService.findOneByUniversalIdentifierGlobal(
- universalIdentifier,
- );
-
- expect(registration).toMatchObject({ isVetted: !isVetted });
-
- const updateResponse = await makeAdminPanelAPIRequest({
- query: gql`
- mutation UpdateAdminApplicationRegistration(
- $input: AdminUpdateApplicationRegistrationInput!
- ) {
- updateAdminApplicationRegistration(input: $input) {
- id
- isVetted
- }
- }
- `,
- variables: {
- input: { id: registration?.id, update: { isVetted } },
- },
- });
-
- expect(updateResponse.body.errors).toBeUndefined();
- expect(
- updateResponse.body.data.updateAdminApplicationRegistration,
- ).toMatchObject({ isVetted });
-
- await applicationRegistrationService.upsertFromCatalog(
- catalogParams,
- );
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ });
- const refreshedResponse = await makeAdminPanelAPIRequest({
- query: gql`
- query FindOneAdminApplicationRegistration($id: String!) {
- findOneAdminApplicationRegistration(id: $id) {
- id
- isVetted
- }
- }
- `,
- variables: { id: registration?.id },
- });
-
- expect(refreshedResponse.body.errors).toBeUndefined();
- expect(
- refreshedResponse.body.data.findOneAdminApplicationRegistration,
- ).toMatchObject({ isVetted });
- } finally {
- await ds.query(
- `DELETE FROM core."applicationRegistration" WHERE "universalIdentifier" = $1`,
- [universalIdentifier],
- );
- }
- },
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier: universalIdentifier.toUpperCase(),
+ name: 'Squatted App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@test/squatter-app',
+ latestAvailableVersion: '9.9.9',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier.toUpperCase(),
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ latestAvailableVersion: '1.0.0',
+ });
+ });
+
+ it('lets the official package take back an official identifier registered from another package', async () => {
+ const { universalIdentifier, sourcePackage } = OFFICIAL_APPLICATION;
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toBeNull();
+
+ try {
+ await insertCatalogApplicationRegistration({
+ universalIdentifier,
+ name: 'Squatted Official App',
+ sourcePackage: '@test/squatter-app',
+ });
+
+ await upsertApplicationRegistrationFromCatalog({
+ universalIdentifier,
+ name: 'Official App',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage,
+ latestAvailableVersion: '2.0.0',
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Official App',
+ sourcePackage,
+ latestAvailableVersion: '2.0.0',
+ });
+ } finally {
+ await cleanupApplicationAndAppRegistration({
+ applicationUniversalIdentifier: universalIdentifier,
+ });
+ }
+ });
+ });
+
+ describe('catalog sync versions', () => {
+ const SOURCE_PACKAGE = '@test/versioned-app';
+
+ const buildCatalogParams = ({
+ universalIdentifier,
+ name,
+ latestAvailableVersion,
+ }: {
+ universalIdentifier: string;
+ name: string;
+ latestAvailableVersion: string | null;
+ }) => ({
+ universalIdentifier,
+ name,
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: SOURCE_PACKAGE,
+ latestAvailableVersion,
+ manifest: buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ }),
+ });
+
+ it('does not downgrade a registration to an older catalog version', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Versioned App',
+ sourcePackage: SOURCE_PACKAGE,
+ latestAvailableVersion: '2.0.0',
+ });
+
+ const registration = await upsertApplicationRegistrationFromCatalog(
+ buildCatalogParams({
+ universalIdentifier,
+ name: 'Older Versioned App',
+ latestAvailableVersion: '1.0.0',
+ }),
+ );
+
+ expect(registration).toBeNull();
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Versioned App',
+ latestAvailableVersion: '2.0.0',
+ });
+ });
+
+ it('does not erase a known version when the catalog entry has none', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Versioned App',
+ sourcePackage: SOURCE_PACKAGE,
+ latestAvailableVersion: '1.0.0',
+ });
+
+ const registration = await upsertApplicationRegistrationFromCatalog(
+ buildCatalogParams({
+ universalIdentifier,
+ name: 'Unversioned App',
+ latestAvailableVersion: null,
+ }),
+ );
+
+ expect(registration).toBeNull();
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Versioned App',
+ latestAvailableVersion: '1.0.0',
+ });
+ });
+
+ it('refreshes a registration served again on the same version', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Versioned App',
+ sourcePackage: SOURCE_PACKAGE,
+ latestAvailableVersion: '1.0.0',
+ });
+
+ const registration = await upsertApplicationRegistrationFromCatalog(
+ buildCatalogParams({
+ universalIdentifier,
+ name: 'Renamed Versioned App',
+ latestAvailableVersion: '1.0.0',
+ }),
+ );
+
+ expect(registration).toMatchObject({
+ name: 'Renamed Versioned App',
+ latestAvailableVersion: '1.0.0',
+ });
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({
+ name: 'Renamed Versioned App',
+ latestAvailableVersion: '1.0.0',
+ });
+ });
+
+ it('sets the version on a registration that has none', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Versioned App',
+ sourcePackage: SOURCE_PACKAGE,
+ latestAvailableVersion: null,
+ });
+
+ await upsertApplicationRegistrationFromCatalog(
+ buildCatalogParams({
+ universalIdentifier,
+ name: 'Versioned App',
+ latestAvailableVersion: '1.0.0',
+ }),
);
- },
- );
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({ latestAvailableVersion: '1.0.0' });
+ });
+ });
+
+ describe('catalog sync assets', () => {
+ // 1x1 transparent PNG, so file type detection accepts the asset
+ const LOGO_PNG = Buffer.from(
+ 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==',
+ 'base64',
+ );
+
+ const buildManifestWithLogo = (universalIdentifier: string) => {
+ const manifest = buildBaseManifest({
+ appId: universalIdentifier,
+ roleId: crypto.randomUUID(),
+ });
+
+ manifest.application.logo = 'public/logo.png';
+
+ return manifest;
+ };
+
+ it('does not store assets from another package on an existing registration', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ });
+
+ await syncMarketplaceCatalogFromRegistryPackage({
+ packageName: '@test/squatter-app',
+ version: '2.0.0',
+ manifest: buildManifestWithLogo(universalIdentifier),
+ asset: LOGO_PNG,
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({ logoFileId: null });
+ });
+
+ it('stores assets from the package the registration is bound to', async () => {
+ const universalIdentifier = crypto.randomUUID();
+
+ await insertCatalogRegistration({
+ universalIdentifier,
+ name: 'Pinned App',
+ sourcePackage: '@test/pinned-app',
+ });
+
+ await syncMarketplaceCatalogFromRegistryPackage({
+ packageName: '@test/pinned-app',
+ version: '2.0.0',
+ manifest: buildManifestWithLogo(universalIdentifier),
+ asset: LOGO_PNG,
+ });
+
+ expect(
+ await findApplicationRegistrationByUniversalIdentifier({
+ universalIdentifier,
+ }),
+ ).toMatchObject({ logoFileId: expect.any(String) });
+ });
+ });
describe('installApplication', () => {
it('should fail if registration does not exist', async () => {
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/find-application-registration-by-universal-identifier.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/find-application-registration-by-universal-identifier.util.ts
new file mode 100644
index 00000000000..9e59601fbb4
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/find-application-registration-by-universal-identifier.util.ts
@@ -0,0 +1,24 @@
+export type ApplicationRegistrationRow = {
+ id: string;
+ name: string;
+ sourcePackage: string | null;
+ latestAvailableVersion: string | null;
+ isVetted: boolean;
+ logoFileId: string | null;
+};
+
+export const findApplicationRegistrationByUniversalIdentifier = async ({
+ universalIdentifier,
+}: {
+ universalIdentifier: string;
+}): Promise<ApplicationRegistrationRow | null> => {
+ const [row] = await globalThis.testDataSource.query(
+ `SELECT id, name, "sourcePackage", "latestAvailableVersion", "isVetted",
+ "logoFileId"
+ FROM core."applicationRegistration"
+ WHERE "universalIdentifier" = $1`,
+ [universalIdentifier],
+ );
+
+ return row ?? null;
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util.ts
new file mode 100644
index 00000000000..7c5c827a291
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util.ts
@@ -0,0 +1,53 @@
+import crypto from 'crypto';
+
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+export const insertCatalogApplicationRegistration = async ({
+ universalIdentifier,
+ name,
+ sourcePackage = null,
+ sourceType = ApplicationRegistrationSourceType.NPM,
+ latestAvailableVersion = '1.0.0',
+ manifest = null,
+ category = null,
+ workspaceId = SEED_APPLE_WORKSPACE_ID,
+}: {
+ universalIdentifier: string;
+ name: string;
+ sourcePackage?: string | null;
+ sourceType?: ApplicationRegistrationSourceType;
+ latestAvailableVersion?: string | null;
+ manifest?: Record<string, unknown> | null;
+ category?: string | null;
+ workspaceId?: string | null;
+}): Promise<string> => {
+ const id = crypto.randomUUID();
+ const oAuthClientId = crypto.randomUUID();
+
+ await globalThis.testDataSource.query(
+ `INSERT INTO core."applicationRegistration"
+ (id, "universalIdentifier", name, "oAuthClientId",
+ "oAuthRedirectUris", "oAuthScopes", "workspaceId",
+ "sourceType", "sourcePackage", "latestAvailableVersion",
+ "manifest", "isListed", "category")
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`,
+ [
+ id,
+ universalIdentifier,
+ name,
+ oAuthClientId,
+ [],
+ [],
+ workspaceId,
+ sourceType,
+ sourcePackage,
+ latestAvailableVersion,
+ manifest ? JSON.stringify(manifest) : null,
+ true,
+ category,
+ ],
+ );
+
+ return id;
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts
new file mode 100644
index 00000000000..e7d1380fd7e
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts
@@ -0,0 +1,44 @@
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+import { type Manifest } from 'twenty-shared/application';
+
+import { type MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service';
+import { type MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';
+
+// Runs the catalog sync against a registry that serves a single package, so
+// the test never reaches npm.
+export const syncMarketplaceCatalogFromRegistryPackage = async ({
+ packageName,
+ version,
+ manifest,
+ asset = null,
+}: {
+ packageName: string;
+ version: string;
+ manifest: Manifest;
+ asset?: Buffer | null;
+}): Promise<void> => {
+ const marketplaceService =
+ getAppProviderByClassName<MarketplaceService>('MarketplaceService');
+
+ const fetchAppsFromRegistrySpy = jest
+ .spyOn(marketplaceService, 'fetchAppsFromRegistry')
+ .mockResolvedValue([
+ { name: packageName, version, description: '', author: 'Unknown' },
+ ]);
+ const fetchManifestFromRegistryCdnSpy = jest
+ .spyOn(marketplaceService, 'fetchManifestFromRegistryCdn')
+ .mockResolvedValue(manifest);
+ const fetchAssetFromRegistryCdnSpy = jest
+ .spyOn(marketplaceService, 'fetchAssetFromRegistryCdn')
+ .mockResolvedValue(asset);
+
+ try {
+ await getAppProviderByClassName<MarketplaceCatalogSyncService>(
+ 'MarketplaceCatalogSyncService',
+ ).syncCatalog();
+ } finally {
+ fetchAppsFromRegistrySpy.mockRestore();
+ fetchManifestFromRegistryCdnSpy.mockRestore();
+ fetchAssetFromRegistryCdnSpy.mockRestore();
+ }
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/upsert-application-registration-from-catalog.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/upsert-application-registration-from-catalog.util.ts
new file mode 100644
index 00000000000..a127d208222
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/upsert-application-registration-from-catalog.util.ts
@@ -0,0 +1,11 @@
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+
+import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { type ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+
+export const upsertApplicationRegistrationFromCatalog = (
+ params: Parameters<ApplicationRegistrationService['upsertFromCatalog']>[0],
+): Promise<ApplicationRegistrationEntity | null> =>
+ getAppProviderByClassName<ApplicationRegistrationService>(
+ 'ApplicationRegistrationService',
+ ).upsertFromCatalog(params);