feat(editor): In-app experience

packages/cli/src/Interfaces.ts

@@ -500,9 +500,6 @@ export interface IN8nUISettings {
 		sharing: boolean;
 		workflowSharing: boolean;
 	};
-	license: {
-		tenantId: number;
-	};
 	hideUsagePage: boolean;
 }
 
@@ -771,6 +768,7 @@ export interface ILicenseReadResponse {
 		planId: string;
 		planName: string;
 	};
+	environment: 'production' | 'staging';
 }
 
 export interface ILicensePostResponse extends ILicenseReadResponse {

packages/cli/src/Server.ts

@@ -359,9 +359,6 @@ class App {
 				workflowSharing: false,
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
-			license: {
-				tenantId: config.getEnv('license.tenantId'),
-			},
 		};
 	}
 

packages/cli/src/events/WorkflowStatistics.ts

@@ -1,4 +1,4 @@
-import { INode, IRun, IWorkflowBase } from 'n8n-workflow';
+import { INode, IRun, IWorkflowBase, LoggerProxy } from 'n8n-workflow';
 import { Db, InternalHooksManager } from '..';
 import { StatisticsNames } from '../databases/entities/WorkflowStatistics';
 import { getWorkflowOwner } from '../UserManagement/UserManagementHelper';
@@ -26,7 +26,7 @@ export async function workflowExecutionCompleted(
 		workflowId = parseInt(workflowData.id as string, 10);
 		if (isNaN(workflowId)) throw new Error('not a number');
 	} catch (error) {
-		console.error(`Error "${error as string}" when casting workflow ID to a number`);
+		LoggerProxy.error(`Error "${error as string}" when casting workflow ID to a number`);
 		return;
 	}
 
@@ -67,7 +67,7 @@ export async function nodeFetchedData(workflowId: string, node: INode): Promise<
 		id = parseInt(workflowId, 10);
 		if (isNaN(id)) throw new Error('not a number');
 	} catch (error) {
-		console.error(`Error ${error as string} when casting workflow ID to a number`);
+		LoggerProxy.error(`Error ${error as string} when casting workflow ID to a number`);
 		return;
 	}
 

packages/cli/src/license/License.service.ts

@@ -1,3 +1,4 @@
+import config from '@/config';
 import { getLicense } from '@/License';
 import { Db, ILicenseReadResponse } from '..';
 
@@ -31,6 +32,7 @@ export class LicenseService {
 				planId: mainPlan?.productId ?? '',
 				planName: license.getPlanName(),
 			},
+			environment: config.getEnv('license.tenantId') === 1 ? 'production' : 'staging',
 		};
 	}
 }

packages/cli/src/license/license.controller.ts

@@ -101,14 +101,14 @@ licenseController.post(
 			await license.renew();
 		} catch (e) {
 			// not awaiting so as not to make the endpoint hang
-			InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: false });
+			void InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: false });
 			if (e instanceof Error) {
 				throw new ResponseHelper.BadRequestError(e.message);
 			}
 		}
 
 		// not awaiting so as not to make the endpoint hang
-		InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: true });
+		void InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: true });
 
 		// Return the read data, plus the management JWT
 		return {

packages/cli/test/integration/license.api.test.ts

@@ -87,7 +87,7 @@ test('POST /license/activate should work for instance owner', async () => {
 	expect(response.statusCode).toBe(200);
 
 	// No license defined so we just expect the result to be the defaults
-	expect(response.body).toStrictEqual(DEFAULT_POST_RESPONSE);
+	expect(response.body).toMatchObject(DEFAULT_POST_RESPONSE);
 });
 
 test('POST /license/activate does not work for regular users', async () => {
@@ -126,7 +126,7 @@ test('POST /license/renew should work for instance owner', async () => {
 	expect(response.statusCode).toBe(200);
 
 	// No license defined so we just expect the result to be the defaults
-	expect(response.body).toStrictEqual(DEFAULT_POST_RESPONSE);
+	expect(response.body).toMatchObject(DEFAULT_POST_RESPONSE);
 });
 
 test('POST /license/renew does not work for regular users', async () => {
@@ -164,6 +164,7 @@ const DEFAULT_LICENSE_RESPONSE: { data: ILicenseReadResponse } = {
 			planId: '',
 			planName: 'Community',
 		},
+		environment: 'production',
 	},
 };
 

packages/cli/test/unit/Events.test.ts

@@ -1,13 +1,13 @@
 import config from '@/config';
 import { InternalHooksManager } from '../../src';
 import { nodeFetchedData, workflowExecutionCompleted } from '../../src/events/WorkflowStatistics';
-import { WorkflowExecuteMode } from 'n8n-workflow';
+import { LoggerProxy, WorkflowExecuteMode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
 
 const FAKE_USER_ID = 'abcde-fghij';
 
 const mockedFirstProductionWorkflowSuccess = jest.fn((...args) => {});
 const mockedFirstWorkflowDataLoad = jest.fn((...args) => {});
-const mockedError = jest.spyOn(console, 'error');
 
 jest.spyOn(InternalHooksManager, 'getInstance').mockImplementation((...args) => {
 	const actual = jest.requireActual('../../src/InternalHooks');
@@ -48,6 +48,7 @@ describe('Events', () => {
 	beforeAll(() => {
 		config.set('diagnostics.enabled', true);
 		config.set('deployment.type', 'n8n-testing');
+		LoggerProxy.init(getLogger());
 	});
 
 	afterAll(() => {
@@ -58,7 +59,6 @@ describe('Events', () => {
 	beforeEach(() => {
 		mockedFirstProductionWorkflowSuccess.mockClear();
 		mockedFirstWorkflowDataLoad.mockClear();
-		mockedError.mockClear();
 	});
 
 	afterEach(() => {});
@@ -81,7 +81,6 @@ describe('Events', () => {
 				startedAt: new Date(),
 			};
 			await workflowExecutionCompleted(workflow, runData);
-			expect(mockedError).toBeCalledTimes(1);
 		});
 
 		test('should create metrics for production successes', async () => {
@@ -164,7 +163,6 @@ describe('Events', () => {
 				parameters: {},
 			};
 			await nodeFetchedData(workflowId, node);
-			expect(mockedError).toBeCalledTimes(1);
 		});
 
 		test('should create metrics when the db is updated', async () => {