The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Split the admin application registration update input (#25963)
Paul Rastoinfaf4ce0d3ac1
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 0aa5936495c..75ba436c033 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4896,9 +4896,6 @@ input UpdateApplicationRegistrationPayload {name: StringoAuthRedirectUris: [String!]oAuthScopes: [String!]- isListed: Boolean- isPreInstalled: Boolean- isVetted: Boolean}input CreateApplicationRegistrationVariableInput {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 7193a388ebc..c65aaa44e9f 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -7591,7 +7591,7 @@ export interface CreateApplicationRegistrationInput {name: Scalars['String'],uniexport interface UpdateApplicationRegistrationInput {id: Scalars['String'],update: UpdateApplicationRegistrationPayload}-export interface UpdateApplicationRegistrationPayload {name?: (Scalars['String'] | null),oAuthRedirectUris?: (Scalars['String'][] | null),oAuthScopes?: (Scalars['String'][] | null),isListed?: (Scalars['Boolean'] | null),isPreInstalled?: (Scalars['Boolean'] | null),isVetted?: (Scalars['Boolean'] | null)}+export interface UpdateApplicationRegistrationPayload {name?: (Scalars['String'] | null),oAuthRedirectUris?: (Scalars['String'][] | null),oAuthScopes?: (Scalars['String'][] | null)}export interface CreateApplicationRegistrationVariableInput {applicationRegistrationId: Scalars['String'],key: Scalars['String'],value: Scalars['String'],description?: (Scalars['String'] | null),isSecret?: (Scalars['Boolean'] | null)}diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 1cb9b6814fa..55a1e91118c 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -12511,15 +12511,6 @@ export default {"oAuthScopes": [1],- "isListed": [- 8- ],- "isPreInstalled": [- 8- ],- "isVetted": [- 8- ],"__typename": [1]diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 42033ec2bd6..820c2ef227d 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -231,6 +231,20 @@ export type AdminPanelWorkspaceUsage = {usedCredits: Scalars['Float']['output'];};+export type AdminUpdateApplicationRegistrationInput = {+ id: Scalars['String']['input'];+ update: AdminUpdateApplicationRegistrationPayload;+};++export type AdminUpdateApplicationRegistrationPayload = {+ isListed?: InputMaybe<Scalars['Boolean']['input']>;+ isPreInstalled?: InputMaybe<Scalars['Boolean']['input']>;+ isVetted?: InputMaybe<Scalars['Boolean']['input']>;+ name?: InputMaybe<Scalars['String']['input']>;+ oAuthRedirectUris?: InputMaybe<Array<Scalars['String']['input']>>;+ oAuthScopes?: InputMaybe<Array<Scalars['String']['input']>>;+};+export type AdminWorkspaceChatThread = {__typename?: 'AdminWorkspaceChatThread';conversationSize: Scalars['Int']['output'];@@ -649,7 +663,7 @@ export type MutationSetMaintenanceModeArgs = {export type MutationUpdateAdminApplicationRegistrationArgs = {- input: UpdateApplicationRegistrationInput;+ input: AdminUpdateApplicationRegistrationInput;};@@ -974,20 +988,6 @@ export type SystemHealthService = {status: AdminPanelHealthServiceStatus;};-export type UpdateApplicationRegistrationInput = {- id: Scalars['String']['input'];- update: UpdateApplicationRegistrationPayload;-};--export type UpdateApplicationRegistrationPayload = {- isListed?: InputMaybe<Scalars['Boolean']['input']>;- isPreInstalled?: InputMaybe<Scalars['Boolean']['input']>;- isVetted?: InputMaybe<Scalars['Boolean']['input']>;- name?: InputMaybe<Scalars['String']['input']>;- oAuthRedirectUris?: InputMaybe<Array<Scalars['String']['input']>>;- oAuthScopes?: InputMaybe<Array<Scalars['String']['input']>>;-};-export type UpdateApplicationRegistrationVariableInput = {id: Scalars['String']['input'];update: UpdateApplicationRegistrationVariablePayload;@@ -1192,7 +1192,7 @@ export type SyncMarketplaceCatalogMutationVariables = Exact<{ [key: string]: nevexport type SyncMarketplaceCatalogMutation = { __typename?: 'Mutation', syncMarketplaceCatalog: boolean };export type UpdateAdminApplicationRegistrationMutationVariables = Exact<{- input: UpdateApplicationRegistrationInput;+ input: AdminUpdateApplicationRegistrationInput;}>;@@ -1514,7 +1514,7 @@ export const GetCustomAiProviderAccessDocument = {"kind":"Document","definitionsexport const GetModelsDevProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModelsDevProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModelsDevProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"modelCount"}},{"kind":"Field","name":{"kind":"Name","value":"npm"}}]}}]}}]} as unknown as DocumentNode<GetModelsDevProvidersQuery, GetModelsDevProvidersQueryVariables>;export const GetModelsDevSuggestionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModelsDevSuggestions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"providerType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModelsDevSuggestions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"providerType"},"value":{"kind":"Variable","name":{"kind":"Name","value":"providerType"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"modelId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"inputCostPerMillionTokens"}},{"kind":"Field","name":{"kind":"Name","value":"outputCostPerMillionTokens"}},{"kind":"Field","name":{"kind":"Name","value":"cachedInputCostPerMillionTokens"}},{"kind":"Field","name":{"kind":"Name","value":"cacheCreationCostPerMillionTokens"}},{"kind":"Field","name":{"kind":"Name","value":"contextWindowTokens"}},{"kind":"Field","name":{"kind":"Name","value":"maxOutputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"modalities"}},{"kind":"Field","name":{"kind":"Name","value":"supportsReasoning"}}]}}]}}]} as unknown as DocumentNode<GetModelsDevSuggestionsQuery, GetModelsDevSuggestionsQueryVariables>;export const SyncMarketplaceCatalogDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SyncMarketplaceCatalog"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"syncMarketplaceCatalog"}}]}}]} as unknown as DocumentNode<SyncMarketplaceCatalogMutation, SyncMarketplaceCatalogMutationVariables>;-export const UpdateAdminApplicationRegistrationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAdminApplicationRegistration"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateApplicationRegistrationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAdminApplicationRegistration"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"galleryImagesUrls"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isVetted"}},{"kind":"Field","name":{"kind":"Name","value":"isPreInstalled"}},{"kind":"Field","name":{"kind":"Name","value":"isConfigured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateAdminApplicationRegistrationMutation, UpdateAdminApplicationRegistrationMutationVariables>;+export const UpdateAdminApplicationRegistrationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAdminApplicationRegistration"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AdminUpdateApplicationRegistrationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAdminApplicationRegistration"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"galleryImagesUrls"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isVetted"}},{"kind":"Field","name":{"kind":"Name","value":"isPreInstalled"}},{"kind":"Field","name":{"kind":"Name","value":"isConfigured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateAdminApplicationRegistrationMutation, UpdateAdminApplicationRegistrationMutationVariables>;export const UpdateAdminApplicationRegistrationVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAdminApplicationRegistrationVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateApplicationRegistrationVariableInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAdminApplicationRegistrationVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"isSecret"}},{"kind":"Field","name":{"kind":"Name","value":"isRequired"}},{"kind":"Field","name":{"kind":"Name","value":"isFilled"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateAdminApplicationRegistrationVariableMutation, UpdateAdminApplicationRegistrationVariableMutationVariables>;export const FindAdminApplicationRegistrationClaimsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationClaims"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationRegistrationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAdminApplicationRegistrationClaims"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationRegistrationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationRegistrationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceDisplayName"}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationClaimsQuery, FindAdminApplicationRegistrationClaimsQueryVariables>;export const FindAdminApplicationRegistrationInstalledWorkspacesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationInstalledWorkspaces"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"FindApplicationRegistrationInstalledWorkspacesInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAdminApplicationRegistrationInstalledWorkspaces"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"hasMore"}},{"kind":"Field","name":{"kind":"Name","value":"workspaces"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"version"}}]}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationInstalledWorkspacesQuery, FindAdminApplicationRegistrationInstalledWorkspacesQueryVariables>;diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 281f54bc59f..996a22d927a 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -6213,9 +6213,6 @@ export type UpdateApplicationRegistrationInput = {};export type UpdateApplicationRegistrationPayload = {- isListed?: InputMaybe<Scalars['Boolean']['input']>;- isPreInstalled?: InputMaybe<Scalars['Boolean']['input']>;- isVetted?: InputMaybe<Scalars['Boolean']['input']>;name?: InputMaybe<Scalars['String']['input']>;oAuthRedirectUris?: InputMaybe<Array<Scalars['String']['input']>>;oAuthScopes?: InputMaybe<Array<Scalars['String']['input']>>;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/mutations/updateAdminApplicationRegistration.ts b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/mutations/updateAdminApplicationRegistration.tsindex 0bbf260a051..78162f96b8c 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/mutations/updateAdminApplicationRegistration.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/mutations/updateAdminApplicationRegistration.ts@@ -4,7 +4,7 @@ import { APPLICATION_REGISTRATION_FRAGMENT } from '@/settings/application-registexport const UPDATE_ADMIN_APPLICATION_REGISTRATION = gql`mutation UpdateAdminApplicationRegistration(- $input: UpdateApplicationRegistrationInput!+ $input: AdminUpdateApplicationRegistrationInput!) {updateAdminApplicationRegistration(input: $input) {...ApplicationRegistrationFragmentdiff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.tsindex 7e55e4f2291..eb62f038a40 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts@@ -64,11 +64,11 @@ import { ApplicationRegistrationEntity } from 'src/engine/core-modules/applicatiimport { 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 { AdminApplicationRegistrationClaimDTO } from 'src/engine/core-modules/application/application-registration/dtos/admin-application-registration-claim.dto';+import { AdminUpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input';import { ApplicationRegistrationInstalledWorkspacesDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-installed-workspaces.dto';import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';import { FindApplicationRegistrationInstalledWorkspacesInput } from 'src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input';import { PaginatedApplicationRegistrationsDTO } from 'src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto';-import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';import { AdminAiModelsDTO } from 'src/engine/core-modules/client-config/client-config.entity';@@ -506,7 +506,7 @@ export class AdminPanelResolver {@UseGuards(AdminPanelGuard)@Mutation(() => ApplicationRegistrationEntity)async updateAdminApplicationRegistration(- @Args('input') input: UpdateApplicationRegistrationInput,+ @Args('input') input: AdminUpdateApplicationRegistrationInput,): Promise<ApplicationRegistrationEntity> {return this.applicationRegistrationService.updateGlobal(input);}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.tsindex 0a579d62748..8fd80375deb 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@@ -25,6 +25,10 @@ import {ApplicationRegistrationException,ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';+import {+ type AdminUpdateApplicationRegistrationInput,+ type AdminUpdateApplicationRegistrationPayload,+} from 'src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input';import { type ApplicationRegistrationInstalledWorkspacesDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-installed-workspaces.dto';import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';import { type ClaimableApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/claimable-application-registration.dto';@@ -588,7 +592,7 @@ export class ApplicationRegistrationService {const existingRegistration = await this.findOneById(id, ownerWorkspaceId);- await this.applyUpdate(id, update);+ await this.applyUpdate({ id, update });await this.broadcastApplicationRegistrationUpdatedById(id,@@ -599,20 +603,37 @@ export class ApplicationRegistrationService {}async updateGlobal(- input: UpdateApplicationRegistrationInput,+ input: AdminUpdateApplicationRegistrationInput,): Promise<ApplicationRegistrationEntity> {- const { id, update } = input;+ const {+ id,+ update: { isListed, isPreInstalled, isVetted, ...update },+ } = input;await this.findOneByIdGlobal(id);- await this.applyUpdate(id, update);+ await this.applyUpdate({+ id,+ update,+ instanceFlags: { isListed, isPreInstalled, isVetted },+ });return this.findOneByIdGlobal(id);}- private async applyUpdate(- id: string,- update: UpdateApplicationRegistrationPayload,- ): Promise<void> {+ // Instance-wide flags travel apart from the payload so the+ // workspace-scoped update has no way to set them.+ private async applyUpdate({+ id,+ update,+ instanceFlags = {},+ }: {+ id: string;+ update: UpdateApplicationRegistrationPayload;+ instanceFlags?: Pick<+ AdminUpdateApplicationRegistrationPayload,+ 'isListed' | 'isPreInstalled' | 'isVetted'+ >;+ }): Promise<void> {if (isDefined(update.oAuthRedirectUris)) {this.validateRedirectUris(update.oAuthRedirectUris);}@@ -628,10 +649,12 @@ export class ApplicationRegistrationService {updateData.oAuthRedirectUris = update.oAuthRedirectUris;if (isDefined(update.oAuthScopes))updateData.oAuthScopes = update.oAuthScopes;- if (isDefined(update.isListed)) updateData.isListed = update.isListed;- if (isDefined(update.isPreInstalled))- updateData.isPreInstalled = update.isPreInstalled;- if (isDefined(update.isVetted)) updateData.isVetted = update.isVetted;+ if (isDefined(instanceFlags.isListed))+ updateData.isListed = instanceFlags.isListed;+ if (isDefined(instanceFlags.isPreInstalled))+ updateData.isPreInstalled = instanceFlags.isPreInstalled;+ if (isDefined(instanceFlags.isVetted))+ updateData.isVetted = instanceFlags.isVetted;if (Object.keys(updateData).length === 0) {return;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input.tsnew file mode 100644index 00000000000..5b0851cdb62--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input.ts@@ -0,0 +1,43 @@+import { Field, InputType } from '@nestjs/graphql';++import { Type } from 'class-transformer';+import {+ IsBoolean,+ IsNotEmpty,+ IsOptional,+ IsUUID,+ ValidateNested,+} from 'class-validator';++import { UpdateApplicationRegistrationPayload } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';++@InputType()+export class AdminUpdateApplicationRegistrationPayload extends UpdateApplicationRegistrationPayload {+ @Field(() => Boolean, { nullable: true })+ @IsBoolean()+ @IsOptional()+ isListed?: boolean;++ @Field(() => Boolean, { nullable: true })+ @IsBoolean()+ @IsOptional()+ isPreInstalled?: boolean;++ @Field(() => Boolean, { nullable: true })+ @IsBoolean()+ @IsOptional()+ isVetted?: boolean;+}++@InputType()+export class AdminUpdateApplicationRegistrationInput {+ @IsNotEmpty()+ @Field()+ @IsUUID()+ id: string;++ @Type(() => AdminUpdateApplicationRegistrationPayload)+ @ValidateNested()+ @Field(() => AdminUpdateApplicationRegistrationPayload)+ update: AdminUpdateApplicationRegistrationPayload;+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/update-application-registration.input.tsindex cb1d8748353..4e5b562138d 100644--- a/packages/twenty-server/src/engine/core-modules/application/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@@ -4,7 +4,6 @@ import { Type } from 'class-transformer';import {ArrayMaxSize,IsArray,- IsBoolean,IsNotEmpty,IsOptional,IsString,@@ -36,21 +35,6 @@ export class UpdateApplicationRegistrationPayload {@MaxLength(256, { each: true })@IsOptional()oAuthScopes?: string[];-- @Field(() => Boolean, { nullable: true })- @IsBoolean()- @IsOptional()- isListed?: boolean;-- @Field(() => Boolean, { nullable: true })- @IsBoolean()- @IsOptional()- isPreInstalled?: boolean;-- @Field(() => Boolean, { nullable: true })- @IsBoolean()- @IsOptional()- isVetted?: boolean;}@InputType()diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/application-registration-instance-flags.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/application-registration-instance-flags.integration-spec.ts.snapnew file mode 100644index 00000000000..928128258b9--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/application-registration-instance-flags.integration-spec.ts.snap@@ -0,0 +1,79 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Application registration instance flags (integration) updateAdminApplicationRegistration should fail for a caller without the SECURITY permission flag 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "PERMISSION_DENIED",+ "userFriendlyMessage": "User does not have permission.",+ },+ "message": "Entity performing the request does not have permission",+ "name": "ForbiddenError",+}+`;++exports[`Application registration instance flags (integration) updateApplicationRegistration should fail when another workspace owns the registration 1`] = `+{+ "extensions": {+ "code": "NOT_FOUND",+ "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",+ "userFriendlyMessage": "Application registration not found.",+ },+ "message": "Application registration with id <applicationRegistrationId> not found",+ "name": "NotFoundError",+}+`;++exports[`Application registration instance flags (integration) updateApplicationRegistration should fail when no workspace has claimed the registration 1`] = `+{+ "extensions": {+ "code": "NOT_FOUND",+ "subCode": "APPLICATION_REGISTRATION_NOT_FOUND",+ "userFriendlyMessage": "Application registration not found.",+ },+ "message": "Application registration with id <applicationRegistrationId> not found",+ "name": "NotFoundError",+}+`;++exports[`Application registration instance flags (integration) updateApplicationRegistration should fail when the payload carries isListed 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "http": {+ "status": 400,+ },+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Field "isListed" is not defined by type "UpdateApplicationRegistrationPayload".",+ "name": "GraphQLError",+}+`;++exports[`Application registration instance flags (integration) updateApplicationRegistration should fail when the payload carries isPreInstalled 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "http": {+ "status": 400,+ },+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Field "isPreInstalled" is not defined by type "UpdateApplicationRegistrationPayload".",+ "name": "GraphQLError",+}+`;++exports[`Application registration instance flags (integration) updateApplicationRegistration should fail when the payload carries isVetted 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "http": {+ "status": 400,+ },+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Field "isVetted" is not defined by type "UpdateApplicationRegistrationPayload".",+ "name": "GraphQLError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/application-registration-instance-flags.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/application-registration-instance-flags.integration-spec.tsnew file mode 100644index 00000000000..5721849780d--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/application-registration-instance-flags.integration-spec.ts@@ -0,0 +1,241 @@+import crypto from 'crypto';++import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';+import { updateAdminApplicationRegistration } from 'test/integration/metadata/suites/application/utils/update-admin-application-registration.util';+import { updateApplicationRegistration } from 'test/integration/metadata/suites/application/utils/update-application-registration.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';++import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import {+ SEED_APPLE_WORKSPACE_ID,+ SEED_YCOMBINATOR_WORKSPACE_ID,+} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++const INITIAL_NAME = 'Instance flags integration test app';+const RENAMED = 'Instance flags integration test app renamed';+const INITIAL_REDIRECT_URIS = ['https://example.com/oauth/callback'];+const REPLACEMENT_REDIRECT_URIS = ['https://attacker.example/oauth/callback'];++type InstanceFlag = 'isListed' | 'isPreInstalled' | 'isVetted';++const INSTANCE_FLAG_TEST_CASES: EachTestingContext<{ flag: InstanceFlag }>[] = [+ {+ title: 'when the payload carries isListed',+ context: { flag: 'isListed' },+ },+ {+ title: 'when the payload carries isPreInstalled',+ context: { flag: 'isPreInstalled' },+ },+ {+ title: 'when the payload carries isVetted',+ context: { flag: 'isVetted' },+ },+];++// The caller's workspace owns 'owned'; the two others must be out of its reach.+type RegistrationOwnership = 'owned' | 'foreign' | 'unclaimed';++const NOT_OWNED_TEST_CASES: EachTestingContext<{+ ownership: Exclude<RegistrationOwnership, 'owned'>;+}>[] = [+ {+ title: 'when another workspace owns the registration',+ context: { ownership: 'foreign' },+ },+ {+ title: 'when no workspace has claimed the registration',+ context: { ownership: 'unclaimed' },+ },+];++const OWNER_WORKSPACE_ID_BY_OWNERSHIP: Record<+ RegistrationOwnership,+ string | null+> = {+ owned: SEED_APPLE_WORKSPACE_ID,+ foreign: SEED_YCOMBINATOR_WORKSPACE_ID,+ unclaimed: null,+};++type RegistrationRow = {+ name: string;+ oAuthRedirectUris: string[];+ isListed: boolean;+ isPreInstalled: boolean;+ isVetted: boolean;+};++const INITIAL_ROW: RegistrationRow = {+ name: INITIAL_NAME,+ oAuthRedirectUris: INITIAL_REDIRECT_URIS,+ isListed: false,+ isPreInstalled: false,+ isVetted: false,+};++describe('Application registration instance flags (integration)', () => {+ const registrationIdByOwnership = {} as Record<RegistrationOwnership, string>;++ const readRegistrationRow = async (+ registrationId: string,+ ): Promise<RegistrationRow> => {+ const [row] = await globalThis.testDataSource.query(+ `SELECT name, "oAuthRedirectUris", "isListed", "isPreInstalled", "isVetted"+ FROM core."applicationRegistration" WHERE id = $1`,+ [registrationId],+ );++ return row;+ };++ beforeAll(async () => {+ for (const [ownership, ownerWorkspaceId] of Object.entries(+ OWNER_WORKSPACE_ID_BY_OWNERSHIP,+ )) {+ const registrationId = crypto.randomUUID();++ await globalThis.testDataSource.query(+ `INSERT INTO core."applicationRegistration"+ (id, "universalIdentifier", name, "oAuthClientId",+ "oAuthRedirectUris", "oAuthScopes", "sourceType", "workspaceId")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,+ [+ registrationId,+ crypto.randomUUID(),+ INITIAL_NAME,+ crypto.randomUUID(),+ INITIAL_REDIRECT_URIS,+ [],+ ApplicationRegistrationSourceType.TARBALL,+ ownerWorkspaceId,+ ],+ );++ registrationIdByOwnership[ownership as RegistrationOwnership] =+ registrationId;+ }+ });++ afterAll(async () => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistration" WHERE id = ANY($1)`,+ [Object.values(registrationIdByOwnership)],+ );+ });++ describe('updateApplicationRegistration', () => {+ it.each(eachTestingContextFilter(NOT_OWNED_TEST_CASES))(+ 'should fail $title',+ async ({ context: { ownership } }) => {+ const registrationId = registrationIdByOwnership[ownership];++ const { errors } = await updateApplicationRegistration({+ id: registrationId,+ update: {+ name: RENAMED,+ oAuthRedirectUris: REPLACEMENT_REDIRECT_URIS,+ },+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({+ errors,+ normalizeMessage: (message) =>+ message.replace(registrationId, '<applicationRegistrationId>'),+ });++ expect(await readRegistrationRow(registrationId)).toEqual(INITIAL_ROW);+ },+ );++ it.each(eachTestingContextFilter(INSTANCE_FLAG_TEST_CASES))(+ 'should fail $title',+ async ({ context: { flag } }) => {+ const registrationId = registrationIdByOwnership.owned;++ const { errors } = await updateApplicationRegistration({+ id: registrationId,+ update: { name: RENAMED, [flag]: true },+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ // The name travelled in the same payload, so a row still carrying its+ // initial name proves nothing was written.+ expect(await readRegistrationRow(registrationId)).toEqual(INITIAL_ROW);+ },+ );++ it('should update the fields the tenant input declares', async () => {+ const registrationId = registrationIdByOwnership.owned;++ const { data } = await updateApplicationRegistration({+ id: registrationId,+ update: { name: RENAMED },+ expectToFail: false,+ });++ expect(data.updateApplicationRegistration).toMatchObject({+ id: registrationId,+ name: RENAMED,+ isListed: false,+ isPreInstalled: false,+ isVetted: false,+ });++ expect(await readRegistrationRow(registrationId)).toEqual({+ ...INITIAL_ROW,+ name: RENAMED,+ });+ });+ });++ describe('updateAdminApplicationRegistration', () => {+ it('should fail for a caller without the SECURITY permission flag', async () => {+ const registrationId = registrationIdByOwnership.owned;++ const { errors } = await updateAdminApplicationRegistration({+ id: registrationId,+ update: { isListed: true, isPreInstalled: true, isVetted: true },+ withGuestRole: true,+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ expect(await readRegistrationRow(registrationId)).toMatchObject({+ isListed: false,+ isPreInstalled: false,+ isVetted: false,+ });+ });++ it('should set the instance flags', async () => {+ const registrationId = registrationIdByOwnership.owned;++ const { data } = await updateAdminApplicationRegistration({+ id: registrationId,+ update: { isListed: true, isPreInstalled: true, isVetted: true },+ expectToFail: false,+ });++ expect(data.updateAdminApplicationRegistration).toMatchObject({+ id: registrationId,+ isListed: true,+ isPreInstalled: true,+ isVetted: true,+ });++ expect(await readRegistrationRow(registrationId)).toMatchObject({+ isListed: true,+ isPreInstalled: true,+ isVetted: true,+ });+ });+ });+});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.tsindex 8533780addd..e2f5a243435 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@@ -243,7 +243,7 @@ describe('Marketplace Catalog Sync (integration)', () => {const updateResponse = await makeAdminPanelAPIRequest({query: gql`mutation UpdateAdminApplicationRegistration(- $input: UpdateApplicationRegistrationInput!+ $input: AdminUpdateApplicationRegistrationInput!) {updateAdminApplicationRegistration(input: $input) {iddiff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration-query-factory.util.tsnew file mode 100644index 00000000000..0e7aa6409c1--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration-query-factory.util.ts@@ -0,0 +1,30 @@+import gql from 'graphql-tag';++import { type AdminUpdateApplicationRegistrationPayload } from 'src/engine/core-modules/application/application-registration/dtos/admin-update-application-registration.input';++export type UpdateAdminApplicationRegistrationFactoryInput = {+ id: string;+ update: AdminUpdateApplicationRegistrationPayload;+};++export const updateAdminApplicationRegistrationQueryFactory = ({+ id,+ update,+}: UpdateAdminApplicationRegistrationFactoryInput) => ({+ query: gql`+ mutation UpdateAdminApplicationRegistration(+ $input: AdminUpdateApplicationRegistrationInput!+ ) {+ updateAdminApplicationRegistration(input: $input) {+ id+ name+ isListed+ isPreInstalled+ isVetted+ }+ }+ `,+ variables: {+ input: { id, update },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration.util.tsnew file mode 100644index 00000000000..f2e485a8928--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-admin-application-registration.util.ts@@ -0,0 +1,55 @@+import { makeAdminPanelAPIRequestWithGuestRole } from 'test/integration/graphql/suites/admin-panel/utils/make-admin-panel-api-request-with-guest-role.util';+import {+ type UpdateAdminApplicationRegistrationFactoryInput,+ updateAdminApplicationRegistrationQueryFactory,+} from 'test/integration/metadata/suites/application/utils/update-admin-application-registration-query-factory.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';+import { makeAdminPanelAPIRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';++import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++type UpdateAdminApplicationRegistrationResult = Pick<+ ApplicationRegistrationEntity,+ 'id' | 'name' | 'isListed' | 'isPreInstalled' | 'isVetted'+>;++export const updateAdminApplicationRegistration = async ({+ id,+ update,+ expectToFail = false,+ withGuestRole = false,+}: UpdateAdminApplicationRegistrationFactoryInput & {+ expectToFail?: boolean;+ withGuestRole?: boolean;+}): CommonResponseBody<{+ updateAdminApplicationRegistration: UpdateAdminApplicationRegistrationResult;+}> => {+ const graphqlOperation = updateAdminApplicationRegistrationQueryFactory({+ id,+ update,+ });++ const response = withGuestRole+ ? await makeAdminPanelAPIRequestWithGuestRole(graphqlOperation)+ : await makeAdminPanelAPIRequest(graphqlOperation);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Update admin application registration should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Update admin application registration has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration-query-factory.util.tsnew file mode 100644index 00000000000..c1c9a0f5ebf--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration-query-factory.util.ts@@ -0,0 +1,32 @@+import gql from 'graphql-tag';++import { type UpdateApplicationRegistrationPayload } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';++export type UpdateApplicationRegistrationFactoryInput = {+ id: string;+ // Extra keys are allowed on purpose: the failing cases send fields the+ // tenant input type does not declare.+ update: UpdateApplicationRegistrationPayload & Record<string, unknown>;+};++export const updateApplicationRegistrationQueryFactory = ({+ id,+ update,+}: UpdateApplicationRegistrationFactoryInput) => ({+ query: gql`+ mutation UpdateApplicationRegistration(+ $input: UpdateApplicationRegistrationInput!+ ) {+ updateApplicationRegistration(input: $input) {+ id+ name+ isListed+ isPreInstalled+ isVetted+ }+ }+ `,+ variables: {+ input: { id, update },+ },+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration.util.tsnew file mode 100644index 00000000000..2b74f3ba283--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/update-application-registration.util.ts@@ -0,0 +1,51 @@+import {+ type UpdateApplicationRegistrationFactoryInput,+ updateApplicationRegistrationQueryFactory,+} from 'test/integration/metadata/suites/application/utils/update-application-registration-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.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';++import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++type UpdateApplicationRegistrationResult = Pick<+ ApplicationRegistrationEntity,+ 'id' | 'name' | 'isListed' | 'isPreInstalled' | 'isVetted'+>;++export const updateApplicationRegistration = async ({+ id,+ update,+ expectToFail = false,+ token,+}: UpdateApplicationRegistrationFactoryInput & {+ expectToFail?: boolean;+ token?: string;+}): CommonResponseBody<{+ updateApplicationRegistration: UpdateApplicationRegistrationResult;+}> => {+ const graphqlOperation = updateApplicationRegistrationQueryFactory({+ id,+ update,+ });++ const response = await makeMetadataAPIRequest(graphqlOperation, token);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Update application registration should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Update application registration has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};