Merge branch 'master' into feat/public-api-credential-project-id

Author: nikhilkuria

packages/cli/src/events/__tests__/telemetry-event-relay.test.ts

@@ -1155,7 +1155,7 @@ describe('TelemetryEventRelay', () => {
 	});
 
 	describe('workflow execution events', () => {
-		it('should track on `first-production-workflow-succeeded` event', () => {
+		it('should track on `first-production-workflow-succeeded` event for personal project', () => {
 			const event: RelayEventMap['first-production-workflow-succeeded'] = {
 				projectId: 'project123',
 				workflowId: 'workflow123',
@@ -1171,6 +1171,22 @@ describe('TelemetryEventRelay', () => {
 			});
 		});
 
+		it('should track on `first-production-workflow-succeeded` event for team project with null userId', () => {
+			const event: RelayEventMap['first-production-workflow-succeeded'] = {
+				projectId: 'project123',
+				workflowId: 'workflow123',
+				userId: null,
+			};
+
+			eventService.emit('first-production-workflow-succeeded', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Workflow first prod success', {
+				project_id: 'project123',
+				workflow_id: 'workflow123',
+				user_id: undefined,
+			});
+		});
+
 		it('should track on `first-workflow-data-loaded` event', () => {
 			const event: RelayEventMap['first-workflow-data-loaded'] = {
 				userId: 'user123',

packages/cli/src/events/maps/relay.event-map.ts

@@ -39,7 +39,7 @@ export type RelayEventMap = {
 	'first-production-workflow-succeeded': {
 		projectId: string;
 		workflowId: string;
-		userId: string;
+		userId: string | null;
 	};
 
 	'first-workflow-data-loaded': {

packages/cli/src/events/relays/telemetry.event-relay.ts

@@ -936,7 +936,7 @@ export class TelemetryEventRelay extends EventRelay {
 		this.telemetry.track('Workflow first prod success', {
 			project_id: projectId,
 			workflow_id: workflowId,
-			user_id: userId,
+			user_id: userId ?? undefined,
 		});
 	}
 

packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts

@@ -77,6 +77,10 @@ export class ChatHubWorkflowService {
 
 			const newWorkflow = new WorkflowEntity();
 
+			// Chat workflows are created as archived to hide them
+			// from the user by default while they are being run.
+			newWorkflow.isArchived = true;
+
 			newWorkflow.versionId = uuidv4();
 			newWorkflow.name = `Chat ${sessionId}`;
 			newWorkflow.active = false;
@@ -409,7 +413,7 @@ export class ChatHubWorkflowService {
 			parameters: {},
 			type: CHAT_TRIGGER_NODE_TYPE,
 			typeVersion: 1.4,
-			position: [0, 0],
+			position: [-448, -112],
 			id: uuidv4(),
 			name: NODE_NAMES.CHAT_TRIGGER,
 			webhookId: uuidv4(),
@@ -432,7 +436,7 @@ export class ChatHubWorkflowService {
 			},
 			type: AGENT_LANGCHAIN_NODE_TYPE,
 			typeVersion: 3,
-			position: [600, 0],
+			position: [608, 0],
 			id: uuidv4(),
 			name: NODE_NAMES.REPLY_AGENT,
 		};
@@ -448,7 +452,7 @@ export class ChatHubWorkflowService {
 
 		const { provider, model } = conversationModel;
 		const common = {
-			position: [600, 300] satisfies [number, number],
+			position: [608, 304] satisfies [number, number],
 			id: uuidv4(),
 			name: NODE_NAMES.CHAT_MODEL,
 			credentials,
@@ -590,7 +594,7 @@ export class ChatHubWorkflowService {
 			},
 			type: MEMORY_BUFFER_WINDOW_NODE_TYPE,
 			typeVersion: 1.3,
-			position: [480, 208],
+			position: [224, 304],
 			id: uuidv4(),
 			name: NODE_NAMES.MEMORY,
 		};
@@ -623,7 +627,7 @@ export class ChatHubWorkflowService {
 			},
 			type: MEMORY_MANAGER_NODE_TYPE,
 			typeVersion: 1.1,
-			position: [224, 0],
+			position: [-192, 48],
 			id: uuidv4(),
 			name: NODE_NAMES.RESTORE_CHAT_MEMORY,
 		};
@@ -653,7 +657,7 @@ export class ChatHubWorkflowService {
 			},
 			type: MERGE_NODE_TYPE,
 			typeVersion: 3.2,
-			position: [224, -100],
+			position: [224, -96],
 			id: uuidv4(),
 			name: NODE_NAMES.MERGE,
 		};

packages/cli/src/services/__tests__/frontend.service.test.ts

@@ -4,8 +4,6 @@ import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import type { BinaryDataConfig, InstanceSettings } from 'n8n-core';
 
-import { N8N_VERSION } from '@/constants';
-
 import type { CredentialTypes } from '@/credential-types';
 import type { CredentialsOverwrites } from '@/credentials-overwrites';
 import type { License } from '@/license';
@@ -206,42 +204,22 @@ describe('FrontendService', () => {
 		it('should return public settings', () => {
 			const expectedPublicSettings: PublicFrontendSettings = {
 				settingsMode: 'public',
-				instanceId: instanceSettings.instanceId,
-				defaultLocale: globalConfig.defaultLocale,
-				versionCli: N8N_VERSION,
-				releaseChannel: globalConfig.generic.releaseChannel,
-				versionNotifications: {
-					enabled: globalConfig.versionNotifications.enabled,
-					endpoint: globalConfig.versionNotifications.endpoint,
-					whatsNewEnabled: globalConfig.versionNotifications.whatsNewEnabled,
-					whatsNewEndpoint: globalConfig.versionNotifications.whatsNewEndpoint,
-					infoUrl: globalConfig.versionNotifications.infoUrl,
-				},
 				userManagement: {
-					quota: 100,
 					smtpSetup: false,
 					showSetupOnFirstLoad: true,
 					authenticationMethod: 'email',
 				},
 				sso: {
-					saml: { loginEnabled: false, loginLabel: '' },
+					saml: { loginEnabled: false },
 					ldap: { loginEnabled: false, loginLabel: '' },
 					oidc: {
 						loginEnabled: false,
 						loginUrl: 'http://localhost:5678/rest/sso/oidc/login',
-						callbackUrl: 'http://localhost:5678/rest/sso/oidc/callback',
 					},
 				},
-				mfa: { enabled: false, enforced: false },
 				authCookie: { secure: false },
-				oauthCallbackUrls: {
-					oauth1: 'http://localhost:5678/rest/oauth1-credential/callback',
-					oauth2: 'http://localhost:5678/rest/oauth2-credential/callback',
-				},
-				banners: { dismissed: [] },
 				previewMode: false,
-				telemetry: { enabled: false },
-				enterprise: { saml: false, ldap: false, oidc: false, showNonProdBanner: false },
+				enterprise: { saml: false, ldap: false, oidc: false },
 			};
 
 			const { service } = createMockService();

packages/cli/src/services/__tests__/workflow-statistics.service.integration.test.ts

@@ -1,4 +1,10 @@
-import { getPersonalProject, createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils';
+import {
+	getPersonalProject,
+	createTeamProject,
+	createWorkflow,
+	testDb,
+	mockInstance,
+} from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import type { IWorkflowDb, Project, WorkflowEntity, User } from '@n8n/db';
 import { WorkflowStatisticsRepository } from '@n8n/db';
@@ -243,6 +249,33 @@ describe('WorkflowStatisticsService', () => {
 			expect(updateSettingsSpy).not.toHaveBeenCalled();
 			expect(emitSpy).not.toHaveBeenCalled();
 		});
+
+		test('emits first-production-workflow-succeeded with null userId for team project', async () => {
+			// ARRANGE
+			const teamProject = await createTeamProject('Team Project');
+			const teamWorkflow = await createWorkflow({}, teamProject);
+			const runData: IRun = {
+				finished: true,
+				status: 'success',
+				data: createEmptyRunExecutionData(),
+				mode: 'internal',
+				startedAt: new Date(),
+			};
+			const emitSpy = jest.spyOn(Container.get(EventService), 'emit');
+			const updateSettingsSpy = jest.spyOn(userService, 'updateSettings');
+
+			// ACT
+			await workflowStatisticsService.workflowExecutionCompleted(teamWorkflow, runData);
+
+			// ASSERT
+			expect(updateSettingsSpy).not.toHaveBeenCalled();
+			expect(emitSpy).toHaveBeenCalledTimes(1);
+			expect(emitSpy).toHaveBeenCalledWith('first-production-workflow-succeeded', {
+				projectId: teamProject.id,
+				workflowId: teamWorkflow.id,
+				userId: null,
+			});
+		});
 	});
 
 	describe('nodeFetchedData', () => {

packages/cli/src/services/frontend.service.ts

@@ -1,9 +1,4 @@
-import type {
-	FrontendSettings,
-	IEnterpriseSettings,
-	ITelemetrySettings,
-	N8nEnvFeatFlags,
-} from '@n8n/api-types';
+import type { FrontendSettings, ITelemetrySettings, N8nEnvFeatFlags } from '@n8n/api-types';
 import { LicenseState, Logger, ModuleRegistry } from '@n8n/backend-common';
 import { GlobalConfig, SecurityConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
@@ -37,29 +32,63 @@ import {
 	getWorkflowHistoryPruneTime,
 } from '@/workflows/workflow-history/workflow-history-helper';
 
-export type PublicEnterpriseSettings = Pick<
-	IEnterpriseSettings,
-	'saml' | 'ldap' | 'oidc' | 'showNonProdBanner'
->;
-
-export type PublicFrontendSettings = Pick<
-	FrontendSettings,
-	| 'settingsMode'
-	| 'instanceId'
-	| 'defaultLocale'
-	| 'versionCli'
-	| 'releaseChannel'
-	| 'versionNotifications'
-	| 'userManagement'
-	| 'sso'
-	| 'mfa'
-	| 'authCookie'
-	| 'oauthCallbackUrls'
-	| 'banners'
-	| 'previewMode'
-	| 'telemetry'
-> & {
-	enterprise: PublicEnterpriseSettings;
+/**
+ * IMPORTANT: Only add settings that are absolutely necessary for non-authenticated pages
+ */
+export type PublicFrontendSettings = {
+	/** Controls initialization flow in settings store */
+	settingsMode: FrontendSettings['settingsMode'];
+
+	/** Used to bypass authentication on the workflows/demo page */
+	previewMode: FrontendSettings['previewMode'];
+
+	authCookie: {
+		/** Blocks insecure access incompatible with the authentication cookie. */
+		secure: FrontendSettings['authCookie']['secure'];
+	};
+
+	userManagement: {
+		/** Used to control login page UI behaviour and conditional SSO Login display */
+		authenticationMethod: FrontendSettings['userManagement']['authenticationMethod'];
+
+		/** Enables initial owner setup */
+		showSetupOnFirstLoad: FrontendSettings['userManagement']['showSetupOnFirstLoad'];
+
+		/** Determines forgot password page UX */
+		smtpSetup: FrontendSettings['userManagement']['smtpSetup'];
+	};
+
+	enterprise: {
+		/** License check for SAML for SSO button visibility */
+		saml: FrontendSettings['enterprise']['saml'];
+
+		/** License check for OIDC for SSO button visibility */
+		oidc: FrontendSettings['enterprise']['oidc'];
+
+		/** License check for LDAP authentication */
+		ldap: FrontendSettings['enterprise']['ldap'];
+	};
+
+	sso: {
+		saml: {
+			/** Config flag for SSO button*/
+			loginEnabled: FrontendSettings['sso']['saml']['loginEnabled'];
+		};
+		ldap: {
+			/** Config flag for LDAP authentication */
+			loginEnabled: FrontendSettings['sso']['ldap']['loginEnabled'];
+
+			/** Customizes login form label (defaults to "Email") */
+			loginLabel: FrontendSettings['sso']['ldap']['loginLabel'];
+		};
+		oidc: {
+			/** Config flag for SSO button*/
+			loginEnabled: FrontendSettings['sso']['oidc']['loginEnabled'];
+
+			/** Required for OIDC authentication redirect URL */
+			loginUrl: FrontendSettings['sso']['oidc']['loginUrl'];
+		};
+	};
 };
 
 @Service()
@@ -491,39 +520,31 @@ export class FrontendService {
 	getPublicSettings(): PublicFrontendSettings {
 		// Get full settings to ensure all required properties are initialized
 		const {
-			instanceId,
-			defaultLocale,
-			versionCli,
-			releaseChannel,
-			versionNotifications,
-			userManagement,
-			sso,
-			mfa,
+			userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup },
+			sso: { saml: ssoSaml, ldap: ssoLdap, oidc: ssoOidc },
 			authCookie,
-			oauthCallbackUrls,
-			banners,
 			previewMode,
-			telemetry,
-			enterprise: { saml, ldap, oidc, showNonProdBanner },
+			enterprise: { saml, ldap, oidc },
 		} = this.getSettings();
 
-		return {
+		const publicSettings: PublicFrontendSettings = {
 			settingsMode: 'public',
-			instanceId,
-			defaultLocale,
-			versionCli,
-			releaseChannel,
-			versionNotifications,
-			userManagement,
-			sso,
-			mfa,
+			userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup },
+			sso: {
+				saml: {
+					loginEnabled: ssoSaml.loginEnabled,
+				},
+				ldap: ssoLdap,
+				oidc: {
+					loginEnabled: ssoOidc.loginEnabled,
+					loginUrl: ssoOidc.loginUrl,
+				},
+			},
 			authCookie,
-			oauthCallbackUrls,
-			banners,
 			previewMode,
-			telemetry,
-			enterprise: { saml, ldap, oidc, showNonProdBanner },
+			enterprise: { saml, ldap, oidc },
 		};
+		return publicSettings;
 	}
 
 	getModuleSettings() {