The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(apps): support logo asset on ConnectionProviderManifest (#25419)
martmull69e46b20fb3c
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 7ca5575f2f2..246e2a2cfe8 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1385,6 +1385,7 @@ type ApplicationConnectionProvider {name: String!displayName: String!oauth: ApplicationConnectionProviderOAuthConfig+ logoUrl: String}type BillingSubscriptionSchedulePhaseItem {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 63fc89edbab..a7f3683560f 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1060,6 +1060,7 @@ export interface ApplicationConnectionProvider {name: Scalars['String']displayName: Scalars['String']oauth?: ApplicationConnectionProviderOAuthConfig+ logoUrl?: Scalars['String']__typename: 'ApplicationConnectionProvider'}@@ -4535,6 +4536,7 @@ export interface ApplicationConnectionProviderGenqlSelection{name?: boolean | numberdisplayName?: boolean | numberoauth?: ApplicationConnectionProviderOAuthConfigGenqlSelection+ logoUrl?: boolean | number__typename?: boolean | number__scalar?: boolean | number}diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 077fd7ec11c..8ea6056243a 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -2721,6 +2721,9 @@ export default {"oauth": [125],+ "logoUrl": [+ 1+ ],"__typename": [1]diff --git a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx b/packages/twenty-docs/developers/extend/apps/logic/connections.mdxindex d4ad4c8e107..dc8badf77d5 100644--- a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx+++ b/packages/twenty-docs/developers/extend/apps/logic/connections.mdx@@ -24,6 +24,9 @@ export default defineConnectionProvider({name: 'linear',displayName: 'Linear',icon: 'IconBrandLinear',+ // Optional: a logo bundled in your app's public/ folder, shown next to the+ // provider in the per-app settings tab.+ logo: 'public/linear-logomark.svg',type: 'oauth',oauth: {authorizationEndpoint: 'https://linear.app/oauth/authorize',@@ -80,6 +83,7 @@ Key points:- `name` is the unique identifier string used in `listConnections({ providerName })` (kebab-case, must match `^[a-z][a-z0-9-]*$`).- `displayName` shows in the per-app settings tab and in the AI tool list.+- `logo` is a path to an asset bundled in your app's `public/` folder, served through the app's public assets. When omitted, the settings tab falls back to a placeholder built from `displayName`.- `clientIdVariable` / `clientSecretVariable` are **names**, not values — they must match keys declared in `defineApplication.serverVariables`. The actual `client_id` and `client_secret` are entered by the server admin through the app registration UI, never committed to your repo.- Use `serverVariables` (not `applicationVariables`) — OAuth credentials are server-wide and one OAuth app per Twenty server.- Until both `serverVariables` are filled in, the per-app settings tab shows a "needs server admin" hint and the "Add connection" button is disabled.diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex ad64cf75eea..01800349838 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -343,6 +343,7 @@ export type ApplicationConnectionProvider = {applicationId: Scalars['String']['output'];displayName: Scalars['String']['output'];id: Scalars['UUID']['output'];+ logoUrl?: Maybe<Scalars['String']['output']>;name: Scalars['String']['output'];oauth?: Maybe<ApplicationConnectionProviderOAuthConfig>;type: Scalars['String']['output'];@@ -8733,7 +8734,7 @@ export type ApplicationConnectionProvidersQueryVariables = Exact<{}>;-export type ApplicationConnectionProvidersQuery = { __typename?: 'Query', applicationConnectionProviders: Array<{ __typename?: 'ApplicationConnectionProvider', id: string, applicationId: string, type: string, name: string, displayName: string, oauth?: { __typename?: 'ApplicationConnectionProviderOAuthConfig', scopes: Array<string>, isClientCredentialsConfigured: boolean } | null }> };+export type ApplicationConnectionProvidersQuery = { __typename?: 'Query', applicationConnectionProviders: Array<{ __typename?: 'ApplicationConnectionProvider', id: string, applicationId: string, type: string, name: string, displayName: string, logoUrl?: string | null, oauth?: { __typename?: 'ApplicationConnectionProviderOAuthConfig', scopes: Array<string>, isClientCredentialsConfigured: boolean } | null }> };export type BillingPriceLicensedFragmentFragment = { __typename?: 'BillingPriceLicensed', stripePriceId: string, unitAmount: number, recurringInterval: SubscriptionInterval, priceUsageType: BillingUsageType, creditAmount?: number | null };@@ -9798,7 +9799,7 @@ export const GithubClaimAuthorizationUrlDocument = {"kind":"Document","definitioexport const UninstallApplicationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UninstallApplication"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"uninstallApplication"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"universalIdentifier"},"value":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}}}]}]}}]} as unknown as DocumentNode<UninstallApplicationMutation, UninstallApplicationMutationVariables>;export const UpdateApplicationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateApplication"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateApplicationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateApplication"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}},{"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":"autoUpgrade"}}]}}]}}]} as unknown as DocumentNode<UpdateApplicationMutation, UpdateApplicationMutationVariables>;export const UpdateOneApplicationVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneApplicationVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneApplicationVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}},{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}]}]}}]} as unknown as DocumentNode<UpdateOneApplicationVariableMutation, UpdateOneApplicationVariableMutationVariables>;-export const ApplicationConnectionProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ApplicationConnectionProviders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"applicationConnectionProviders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"oauth"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"isClientCredentialsConfigured"}}]}}]}}]}}]} as unknown as DocumentNode<ApplicationConnectionProvidersQuery, ApplicationConnectionProvidersQueryVariables>;+export const ApplicationConnectionProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ApplicationConnectionProviders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"applicationConnectionProviders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"oauth"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"isClientCredentialsConfigured"}}]}}]}}]}}]} as unknown as DocumentNode<ApplicationConnectionProvidersQuery, ApplicationConnectionProvidersQueryVariables>;export const CancelSwitchBillingIntervalDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelSwitchBillingInterval"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelSwitchBillingInterval"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentBillingSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhase"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"start_date"}},{"kind":"Field","name":{"kind":"Name","value":"end_date"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"interval"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptionItems"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"hasReachedCurrentPeriodCap"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"billingProduct"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"images"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"productKey"}},{"kind":"Field","name":{"kind":"Name","value":"planKey"}},{"kind":"Field","name":{"kind":"Name","value":"priceUsageBased"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}}]}}]} as unknown as DocumentNode<CancelSwitchBillingIntervalMutation, CancelSwitchBillingIntervalMutationVariables>;export const CancelSwitchBillingPlanDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelSwitchBillingPlan"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelSwitchBillingPlan"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentBillingSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhase"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"start_date"}},{"kind":"Field","name":{"kind":"Name","value":"end_date"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"interval"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptionItems"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"hasReachedCurrentPeriodCap"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"billingProduct"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"images"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"productKey"}},{"kind":"Field","name":{"kind":"Name","value":"planKey"}},{"kind":"Field","name":{"kind":"Name","value":"priceUsageBased"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}}]}}]} as unknown as DocumentNode<CancelSwitchBillingPlanMutation, CancelSwitchBillingPlanMutationVariables>;export const CancelSwitchResourceCreditPriceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelSwitchResourceCreditPrice"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelSwitchResourceCreditPrice"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentBillingSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhase"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"start_date"}},{"kind":"Field","name":{"kind":"Name","value":"end_date"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"interval"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptionItems"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"hasReachedCurrentPeriodCap"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"billingProduct"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"images"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"productKey"}},{"kind":"Field","name":{"kind":"Name","value":"planKey"}},{"kind":"Field","name":{"kind":"Name","value":"priceUsageBased"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}}]}}]} as unknown as DocumentNode<CancelSwitchResourceCreditPriceMutation, CancelSwitchResourceCreditPriceMutationVariables>;diff --git a/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectionProviders.ts b/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectionProviders.tsindex 677505d4e36..cc5408110d4 100644--- a/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectionProviders.ts+++ b/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectionProviders.ts@@ -8,6 +8,7 @@ export const FIND_APPLICATION_CONNECTION_PROVIDERS = gql`typenamedisplayName+ logoUrloauth {scopesisClientCredentialsConfigureddiff --git a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsxindex cc51eeaae33..689f2043667 100644--- a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx+++ b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx@@ -125,6 +125,7 @@ describe('SettingsApplicationConnectionDetail', () => {type: 'oauth',name: 'google-calendar',displayName: 'Google Calendar',+ logoUrl: null,oauth: {scopes: ['calendar.readonly'],isClientCredentialsConfigured: true,diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsxindex 12c2d9f7c8c..2b1eab4db81 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx@@ -12,7 +12,7 @@ import { Table } from '@/ui/layout/table/components/Table';import { TableCell } from '@/ui/layout/table/components/TableCell';import { TableHeader } from '@/ui/layout/table/components/TableHeader';import { TableRow } from '@/ui/layout/table/components/TableRow';-import { Status } from 'twenty-ui/data-display';+import { Avatar, Status } from 'twenty-ui/data-display';import { Info } from 'twenty-ui/feedback';import {IconChevronRight,@@ -29,6 +29,7 @@ import { useFindApplicationConnectionProviders } from '~/pages/settings/applicatimport { useMyAppConnectedAccounts } from '~/pages/settings/applications/hooks/useMyAppConnectedAccounts';import { useTriggerAppOAuth } from '~/pages/settings/applications/hooks/useTriggerAppOAuth';import { type FrontendApplicationConnectionProvider } from '~/pages/settings/applications/types/FrontendApplicationConnectionProvider';+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';const CONNECTION_TABLE_ROW_GRID_TEMPLATE_COLUMNS ='minmax(0, 1fr) 160px 180px 36px';@@ -125,6 +126,13 @@ export const SettingsApplicationConnectionsSection = ({<H2Titletitle={provider.displayName}description={t`Manage connections used by this app to call ${provider.displayName}.`}+ adornment={+ <Avatar+ type="app"+ avatarUrl={getAbsoluteImageUrl(provider.logoUrl)}+ placeholder={provider.displayName}+ />+ }/>{isOAuth && !isClientCredentialsConfigured && (<Infodiff --git a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsxindex 15ca58abdca..2c4f6a6436c 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx@@ -53,6 +53,7 @@ describe('SettingsApplicationConnectionsSection', () => {type: 'oauth',name: 'google-calendar',displayName: 'Google Calendar',+ logoUrl: null,oauth: {scopes: ['calendar.readonly'],isClientCredentialsConfigured: false,diff --git a/packages/twenty-front/src/pages/settings/applications/types/FrontendApplicationConnectionProvider.ts b/packages/twenty-front/src/pages/settings/applications/types/FrontendApplicationConnectionProvider.tsindex 5722e231542..0c52eef643c 100644--- a/packages/twenty-front/src/pages/settings/applications/types/FrontendApplicationConnectionProvider.ts+++ b/packages/twenty-front/src/pages/settings/applications/types/FrontendApplicationConnectionProvider.ts@@ -14,5 +14,6 @@ export type FrontendApplicationConnectionProvider = {type: ConnectionProviderType;name: string;displayName: string;+ logoUrl: string | null;oauth: FrontendApplicationConnectionProviderOAuthConfig | null;};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-39/2-39-instance-command-fast-1788542613404-add-logo-to-connection-provider.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-39/2-39-instance-command-fast-1788542613404-add-logo-to-connection-provider.tsnew file mode 100644index 00000000000..a8dadf33237--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-39/2-39-instance-command-fast-1788542613404-add-logo-to-connection-provider.ts@@ -0,0 +1,21 @@+import { QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.39.0', 1788542613404)+export class AddLogoToConnectionProviderFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."connectionProvider" ADD COLUMN IF NOT EXISTS "logo" character varying',+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."connectionProvider" DROP COLUMN IF EXISTS "logo"',+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex a4482994dc8..a2a6a12fca0 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -174,6 +174,7 @@ import { RenameEmailingDomainPermanentlySuspendedToSandboxFastInstanceCommand }import { RelaxNavigationPayloadCheckFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1788272351970-relax-navigation-payload-check';import { EraseObjectNavigationCommandMenuItemPayloadsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-slow-1788272351971-erase-object-navigation-command-menu-item-payloads';import { ReshapeUsageLimitPeriodFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1788367160891-reshape-usage-limit-period';+import { AddLogoToConnectionProviderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-39/2-39-instance-command-fast-1788542613404-add-logo-to-connection-provider';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -350,4 +351,5 @@ export const INSTANCE_COMMANDS = [RelaxNavigationPayloadCheckFastInstanceCommand,EraseObjectNavigationCommandMenuItemPayloadsSlowInstanceCommand,ReshapeUsageLimitPeriodFastInstanceCommand,+ AddLogoToConnectionProviderFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-connection-provider-manifest-to-universal-flat-connection-provider.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-connection-provider-manifest-to-universal-flat-connection-provider.util.spec.tsindex 5faf27cc68d..2997484d6ae 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-connection-provider-manifest-to-universal-flat-connection-provider.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-connection-provider-manifest-to-universal-flat-connection-provider.util.spec.ts@@ -38,6 +38,7 @@ describe('fromConnectionProviderManifestToUniversalFlatConnectionProvider', () =applicationUniversalIdentifier: APP_UID,name: 'linear',displayName: 'Linear',+ logo: null,type: 'oauth',oauthConfig: {authorizationEndpoint: 'https://linear.app/oauth/authorize',@@ -57,6 +58,19 @@ describe('fromConnectionProviderManifestToUniversalFlatConnectionProvider', () =});});+ it('passes through the logo path when provided', () => {+ const result =+ fromConnectionProviderManifestToUniversalFlatConnectionProvider({+ connectionProviderManifest: buildManifest({+ logo: 'public/linear-logomark.svg',+ }),+ applicationUniversalIdentifier: APP_UID,+ now: NOW,+ });++ expect(result.logo).toBe('public/linear-logomark.svg');+ });+it('resolves the onConnectLogicFunction universalIdentifier into the flat field when provided', () => {const onConnectLogicFunctionUniversalIdentifier ='c1c1c1c1-c1c1-4c1c-c1c1-c1c1c1c1c1c1';diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-connection-provider-manifest-to-universal-flat-connection-provider.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-connection-provider-manifest-to-universal-flat-connection-provider.util.tsindex f7ff0c5c9c5..9392cec27af 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-connection-provider-manifest-to-universal-flat-connection-provider.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-connection-provider-manifest-to-universal-flat-connection-provider.util.ts@@ -41,6 +41,7 @@ export const fromConnectionProviderManifestToUniversalFlatConnectionProvider =applicationUniversalIdentifier,name: connectionProviderManifest.name,displayName: connectionProviderManifest.displayName,+ logo: connectionProviderManifest.logo ?? null,type: connectionProviderManifest.type,oauthConfig,onConnectLogicFunctionUniversalIdentifier:diff --git a/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application.resolver.tsindex df03f6c1085..7abc3cbd4e6 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts@@ -1,13 +1,13 @@import { UseGuards } from '@nestjs/common';import { Args, Parent, Query, ResolveField } from '@nestjs/graphql';-import { ApiPath } from 'twenty-shared/types';-import { isAbsoluteUrl, isDefined } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { ApplicationStopService } from 'src/engine/core-modules/application/application-stop/application-stop.service';import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';+import { buildPublicAssetLogoUrl } from 'src/engine/core-modules/application/utils/build-public-asset-logo-url.util';import { SdkClientChecksumsDTO } from 'src/engine/core-modules/sdk-client/dtos/sdk-client-checksums.dto';import { getInstalledSdkMetadataModule } from 'src/engine/core-modules/sdk-client/utils/get-installed-sdk-metadata-module.util';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';@@ -69,18 +69,11 @@ export class ApplicationResolver {@Parent() application: Pick<ApplicationDTO, 'id' | 'logo'>,@AuthWorkspace() workspace: WorkspaceEntity,): string | null {- const logo = application.logo;-- if (!isDefined(logo) || logo.length === 0) {- return null;- }-- if (isAbsoluteUrl(logo)) {- return logo;- }-- const serverUrl = this.twentyConfigService.get('SERVER_URL');-- return `${serverUrl}/${ApiPath.PublicAssets}/${workspace.id}/${application.id}/${logo}`;+ return buildPublicAssetLogoUrl({+ logo: application.logo,+ serverUrl: this.twentyConfigService.get('SERVER_URL'),+ workspaceId: workspace.id,+ applicationId: application.id,+ });}}diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.tsindex 0d5bfb99882..e1283b99d4b 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts@@ -1,10 +1,12 @@import { UseGuards } from '@nestjs/common';-import { Args, Query } from '@nestjs/graphql';+import { Args, Parent, Query, ResolveField } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ApplicationConnectionProviderDTO } from 'src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto';import { ConnectionProviderService } from 'src/engine/core-modules/application/connection-provider/connection-provider.service';+import { buildPublicAssetLogoUrl } from 'src/engine/core-modules/application/utils/build-public-asset-logo-url.util';+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';@@ -15,6 +17,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';export class ApplicationConnectionProviderResolver {constructor(private readonly oauthProviderService: ConnectionProviderService,+ private readonly twentyConfigService: TwentyConfigService,) {}@Query(() => [ApplicationConnectionProviderDTO])@@ -40,6 +43,7 @@ export class ApplicationConnectionProviderResolver {type: provider.type,name: provider.name,displayName: provider.displayName,+ logo: provider.logo,oauth:provider.type === 'oauth' && provider.oauthConfig? {@@ -50,4 +54,21 @@ export class ApplicationConnectionProviderResolver {: null,}));}++ @ResolveField(() => String, { nullable: true })+ logoUrl(+ @Parent()+ connectionProvider: Pick<+ ApplicationConnectionProviderDTO,+ 'applicationId' | 'logo'+ >,+ @AuthWorkspace() workspace: WorkspaceEntity,+ ): string | null {+ return buildPublicAssetLogoUrl({+ logo: connectionProvider.logo,+ serverUrl: this.twentyConfigService.get('SERVER_URL'),+ workspaceId: workspace.id,+ applicationId: connectionProvider.applicationId,+ });+ }}diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.entity.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.entity.tsindex cbc0e2331b8..6b01065eb65 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.entity.ts@@ -34,6 +34,13 @@ export class ConnectionProviderEntity@Column({ nullable: false, type: 'varchar' })displayName: string;+ @Column({ nullable: true, type: 'varchar' })+ @WasIntroducedInUpgrade({+ upgradeCommandName:+ '2.39.0_AddLogoToConnectionProviderFastInstanceCommand_1788542613404',+ })+ logo: string | null;+@Column({ nullable: false, type: 'varchar' })type: ConnectionProviderType;diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto.tsindex 2b0707031fa..7eea91d088f 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto.ts@@ -35,6 +35,8 @@ export class ApplicationConnectionProviderDTO {@Field()displayName: string;+ logo: string | null;+@Field(() => ApplicationConnectionProviderOAuthConfigDTO, { nullable: true })oauth: ApplicationConnectionProviderOAuthConfigDTO | null;}diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/build-public-asset-logo-url.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/build-public-asset-logo-url.util.spec.tsnew file mode 100644index 00000000000..352142412ef--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/__tests__/build-public-asset-logo-url.util.spec.ts@@ -0,0 +1,33 @@+import { buildPublicAssetLogoUrl } from 'src/engine/core-modules/application/utils/build-public-asset-logo-url.util';++const BASE_ARGS = {+ serverUrl: 'https://crm.example.com',+ workspaceId: '20202020-1c25-4d02-bf25-6aeccf7ea419',+ applicationId: '5f3e1b9a-1c25-4d02-bf25-6aeccf7ea420',+};++describe('buildPublicAssetLogoUrl', () => {+ it.each([[null], [undefined], ['']])(+ 'returns null when the logo is %p',+ (logo) => {+ expect(buildPublicAssetLogoUrl({ ...BASE_ARGS, logo })).toBeNull();+ },+ );++ it('returns the logo untouched when it is already an absolute url', () => {+ expect(+ buildPublicAssetLogoUrl({+ ...BASE_ARGS,+ logo: 'https://cdn.example.com/logo.svg',+ }),+ ).toBe('https://cdn.example.com/logo.svg');+ });++ it('builds a public-assets url from an application-relative path', () => {+ expect(+ buildPublicAssetLogoUrl({ ...BASE_ARGS, logo: 'public/logo.svg' }),+ ).toBe(+ `https://crm.example.com/public-assets/${BASE_ARGS.workspaceId}/${BASE_ARGS.applicationId}/public/logo.svg`,+ );+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/utils/build-public-asset-logo-url.util.ts b/packages/twenty-server/src/engine/core-modules/application/utils/build-public-asset-logo-url.util.tsnew file mode 100644index 00000000000..9067a08fb43--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/utils/build-public-asset-logo-url.util.ts@@ -0,0 +1,25 @@+import { isNonEmptyString } from '@sniptt/guards';+import { ApiPath } from 'twenty-shared/types';+import { isAbsoluteUrl } from 'twenty-shared/utils';++export const buildPublicAssetLogoUrl = ({+ logo,+ serverUrl,+ workspaceId,+ applicationId,+}: {+ logo: string | null | undefined;+ serverUrl: string;+ workspaceId: string;+ applicationId: string;+}): string | null => {+ if (!isNonEmptyString(logo)) {+ return null;+ }++ if (isAbsoluteUrl(logo)) {+ return logo;+ }++ return `${serverUrl}/${ApiPath.PublicAssets}/${workspaceId}/${applicationId}/${logo}`;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snapindex 51e079adb6d..26098574e47 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap@@ -61,6 +61,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should ma"propertiesToCompare": ["name","displayName",+ "logo","type","oauthConfig","onConnectLogicFunctionUniversalIdentifier",diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.tsindex 77a8eb2ce08..6c3d9fb4db5 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts@@ -1839,6 +1839,7 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {toStringify: false,universalProperty: undefined,},+ logo: { toCompare: true, toStringify: false, universalProperty: undefined },type: { toCompare: true, toStringify: false, universalProperty: undefined },oauthConfig: {toCompare: true,diff --git a/packages/twenty-server/test/integration/metadata/suites/connection-provider/connection-provider-resolver.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/connection-provider/connection-provider-resolver.integration-spec.tsindex e12d28860c1..501852b139f 100644--- a/packages/twenty-server/test/integration/metadata/suites/connection-provider/connection-provider-resolver.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/connection-provider/connection-provider-resolver.integration-spec.ts@@ -7,6 +7,9 @@ import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/mimport { type Manifest } from 'twenty-shared/application';import { v4 as uuidv4 } from 'uuid';+import { ConfigVariables } from 'src/engine/core-modules/twenty-config/config-variables';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+const TEST_APP_ID = uuidv4();const TEST_ROLE_ID = uuidv4();const TEST_PROVIDER_ID = uuidv4();@@ -75,6 +78,7 @@ describe('applicationConnectionProviders resolver (e2e)', () => {typenamedisplayName+ logoUrloauth {scopesisClientCredentialsConfigured@@ -96,6 +100,7 @@ describe('applicationConnectionProviders resolver (e2e)', () => {type: 'oauth',name: 'linear',displayName: 'Linear',+ logoUrl: null,oauth: {scopes: ['read', 'write'],// The fixture registration's OAuth client_id / client_secret server@@ -106,6 +111,56 @@ describe('applicationConnectionProviders resolver (e2e)', () => {});}, 60000);+ it('resolves logoUrl through the public-assets route when the manifest declares a logo', async () => {+ await syncApplication({+ manifest: buildManifest({+ connectionProviders: [+ {+ universalIdentifier: TEST_PROVIDER_ID,+ name: 'linear',+ displayName: 'Linear',+ logo: 'public/linear-logomark.svg',+ type: 'oauth',+ oauth: {+ authorizationEndpoint: 'https://linear.app/oauth/authorize',+ tokenEndpoint: 'https://api.linear.app/oauth/token',+ scopes: ['read', 'write'],+ clientIdVariable: 'LINEAR_CLIENT_ID',+ clientSecretVariable: 'LINEAR_CLIENT_SECRET',+ },+ },+ ],+ }),+ expectToFail: false,+ });++ const applicationId = await findApplicationDbId(TEST_APP_ID);++ const response = await makeMetadataAPIRequest({+ query: gql`+ query ApplicationConnectionProviders($applicationId: UUID!) {+ applicationConnectionProviders(applicationId: $applicationId) {+ logoUrl+ }+ }+ `,+ variables: { applicationId },+ });++ expect(response.status).toBe(200);+ expect(response.body.errors).toBeUndefined();++ const providers = response.body.data.applicationConnectionProviders;++ const serverUrl =+ process.env.SERVER_URL ?? new ConfigVariables().SERVER_URL;++ expect(providers).toHaveLength(1);+ expect(providers[0].logoUrl).toBe(+ `${serverUrl}/public-assets/${SEED_APPLE_WORKSPACE_ID}/${applicationId}/public/linear-logomark.svg`,+ );+ }, 60000);+it('returns an empty array when the application has no connection providers', async () => {await syncApplication({manifest: buildManifest({ connectionProviders: [] }),diff --git a/packages/twenty-shared/src/application/connectionProviderManifestType.ts b/packages/twenty-shared/src/application/connectionProviderManifestType.tsindex d1fcfcaab8e..331c9820a6d 100644--- a/packages/twenty-shared/src/application/connectionProviderManifestType.ts+++ b/packages/twenty-shared/src/application/connectionProviderManifestType.ts@@ -4,6 +4,7 @@ import { type SyncableEntityOptions } from '@/application/syncableEntityOptionsTexport type ConnectionProviderManifest = SyncableEntityOptions & {name: string;displayName: string;+ logo?: string;type: 'oauth';oauth: OAuthConnectionProviderConfig;onConnectLogicFunction?: SyncableEntityOptions;