Revert "feat(core): Read ephemeral license from environment and cleanup ee flags (#5797)" (#5816)

Revert "feat(core): Read ephemeral license from environment and clean up ee flags (#5797)"

This reverts commit a81ca7c19c.

packages/cli/src/Ldap/constants.ts

@@ -2,6 +2,8 @@ import type { LdapConfig } from './types';
 
 export const LDAP_FEATURE_NAME = 'features.ldap';
 
+export const LDAP_ENABLED = 'enterprise.features.ldap';
+
 export const LDAP_LOGIN_LABEL = 'sso.ldap.loginLabel';
 
 export const LDAP_LOGIN_ENABLED = 'sso.ldap.loginEnabled';

packages/cli/src/Ldap/helpers.ts

@@ -17,6 +17,7 @@ import { LdapManager } from './LdapManager.ee';
 import {
 	BINARY_AD_ATTRIBUTES,
 	LDAP_CONFIG_SCHEMA,
+	LDAP_ENABLED,
 	LDAP_FEATURE_NAME,
 	LDAP_LOGIN_ENABLED,
 	LDAP_LOGIN_LABEL,
@@ -36,7 +37,7 @@ import {
  */
 export const isLdapEnabled = (): boolean => {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isLdapEnabled();
+	return isUserManagementEnabled() && (config.getEnv(LDAP_ENABLED) || license.isLdapEnabled());
 };
 
 /**

packages/cli/src/License.ts

@@ -8,11 +8,6 @@ import { LICENSE_FEATURES, N8N_VERSION, SETTINGS_LICENSE_CERT_KEY } from './cons
 import { Service } from 'typedi';
 
 async function loadCertStr(): Promise<TLicenseContainerStr> {
-	// if we have an ephemeral license, we don't want to load it from the database
-	const ephemeralLicense = config.get('license.cert');
-	if (ephemeralLicense) {
-		return ephemeralLicense;
-	}
 	const databaseSettings = await Db.collections.Settings.findOne({
 		where: {
 			key: SETTINGS_LICENSE_CERT_KEY,
@@ -23,8 +18,6 @@ async function loadCertStr(): Promise<TLicenseContainerStr> {
 }
 
 async function saveCertStr(value: TLicenseContainerStr): Promise<void> {
-	// if we have an ephemeral license, we don't want to save it to the database
-	if (config.get('license.cert')) return;
 	await Db.collections.Settings.upsert(
 		{
 			key: SETTINGS_LICENSE_CERT_KEY,

packages/cli/src/Server.ts

@@ -311,8 +311,8 @@ class Server extends AbstractServer {
 				sharing: false,
 				ldap: false,
 				saml: false,
-				logStreaming: false,
-				advancedExecutionFilters: false,
+				logStreaming: config.getEnv('enterprise.features.logStreaming'),
+				advancedExecutionFilters: config.getEnv('enterprise.features.advancedExecutionFilters'),
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
 			license: {

packages/cli/src/UserManagement/UserManagementHelper.ts

@@ -57,7 +57,10 @@ export function isUserManagementEnabled(): boolean {
 
 export function isSharingEnabled(): boolean {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSharingEnabled();
+	return (
+		isUserManagementEnabled() &&
+		(config.getEnv('enterprise.features.sharing') || license.isSharingEnabled())
+	);
 }
 
 export async function getRoleId(scope: Role['scope'], name: Role['name']): Promise<Role['id']> {

packages/cli/src/api/e2e.api.ts

@@ -5,7 +5,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Router } from 'express';
-import type { Request } from 'express';
 import bodyParser from 'body-parser';
 import { v4 as uuid } from 'uuid';
 import config from '@/config';
@@ -13,26 +12,12 @@ import * as Db from '@/Db';
 import type { Role } from '@db/entities/Role';
 import { hashPassword } from '@/UserManagement/UserManagementHelper';
 import { eventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import Container from 'typedi';
-import { License } from '../License';
 
 if (process.env.E2E_TESTS !== 'true') {
 	console.error('E2E endpoints only allowed during E2E tests');
 	process.exit(1);
 }
 
-const enabledFeatures = {
-	sharing: true, //default to true here instead of setting it in config/index.ts for e2e
-	ldap: false,
-	saml: false,
-	logStreaming: false,
-	advancedExecutionFilters: false,
-};
-
-type Feature = keyof typeof enabledFeatures;
-
-Container.get(License).isFeatureEnabled = (feature: Feature) => enabledFeatures[feature] ?? false;
-
 const tablesToTruncate = [
 	'auth_identity',
 	'auth_provider_sync_history',
@@ -93,7 +78,7 @@ const setupUserManagement = async () => {
 };
 
 const resetLogStreaming = async () => {
-	enabledFeatures.logStreaming = false;
+	config.set('enterprise.features.logStreaming', false);
 	for (const id in eventBus.destinations) {
 		await eventBus.removeDestination(id);
 	}
@@ -142,8 +127,7 @@ e2eController.post('/db/setup-owner', bodyParser.json(), async (req, res) => {
 	res.writeHead(204).end();
 });
 
-e2eController.post('/enable-feature/:feature', async (req: Request<{ feature: Feature }>, res) => {
-	const { feature } = req.params;
-	enabledFeatures[feature] = true;
+e2eController.post('/enable-feature/:feature', async (req, res) => {
+	config.set(`enterprise.features.${req.params.feature}`, true);
 	res.writeHead(204).end();
 });

packages/cli/src/config/index.ts

@@ -26,6 +26,10 @@ if (inE2ETests) {
 
 const config = convict(schema, { args: [] });
 
+if (inE2ETests) {
+	config.set('enterprise.features.sharing', true);
+}
+
 // eslint-disable-next-line @typescript-eslint/unbound-method
 config.getEnv = config.get;
 

packages/cli/src/config/schema.ts

@@ -990,6 +990,31 @@ export const schema = {
 		},
 	},
 
+	enterprise: {
+		features: {
+			sharing: {
+				format: Boolean,
+				default: false,
+			},
+			ldap: {
+				format: Boolean,
+				default: false,
+			},
+			saml: {
+				format: Boolean,
+				default: false,
+			},
+			logStreaming: {
+				format: Boolean,
+				default: false,
+			},
+			advancedExecutionFilters: {
+				format: Boolean,
+				default: false,
+			},
+		},
+	},
+
 	sso: {
 		justInTimeProvisioning: {
 			format: Boolean,
@@ -1141,12 +1166,6 @@ export const schema = {
 			env: 'N8N_LICENSE_TENANT_ID',
 			doc: 'Tenant id used by the license manager',
 		},
-		cert: {
-			format: String,
-			default: '',
-			env: 'N8N_LICENSE_CERT',
-			doc: 'Ephemeral license certificate',
-		},
 	},
 
 	hideUsagePage: {

packages/cli/src/eventbus/MessageEventBus/MessageEventBusHelper.ts

@@ -1,7 +1,8 @@
+import config from '@/config';
 import { License } from '@/License';
 import { Container } from 'typedi';
 
 export function isLogStreamingEnabled(): boolean {
 	const license = Container.get(License);
-	return license.isLogStreamingEnabled();
+	return config.getEnv('enterprise.features.logStreaming') || license.isLogStreamingEnabled();
 }

packages/cli/src/executions/executionHelpers.ts

@@ -2,6 +2,7 @@ import { Container } from 'typedi';
 import type { IExecutionFlattedDb } from '@/Interfaces';
 import type { ExecutionStatus } from 'n8n-workflow';
 import { License } from '@/License';
+import config from '@/config';
 
 export function getStatusUsingPreviousExecutionStatusMethod(
 	execution: IExecutionFlattedDb,
@@ -21,5 +22,8 @@ export function getStatusUsingPreviousExecutionStatusMethod(
 
 export function isAdvancedExecutionFiltersEnabled(): boolean {
 	const license = Container.get(License);
-	return license.isAdvancedExecutionFiltersEnabled();
+	return (
+		config.getEnv('enterprise.features.advancedExecutionFilters') ||
+		license.isAdvancedExecutionFiltersEnabled()
+	);
 }

packages/cli/src/sso/saml/constants.ts

@@ -28,6 +28,8 @@ export class SamlUrls {
 
 export const SAML_PREFERENCES_DB_KEY = 'features.saml';
 
+export const SAML_ENTERPRISE_FEATURE_ENABLED = 'enterprise.features.saml';
+
 export const SAML_LOGIN_LABEL = 'sso.saml.loginLabel';
 
 export const SAML_LOGIN_ENABLED = 'sso.saml.loginEnabled';

packages/cli/src/sso/saml/samlHelpers.ts

@@ -10,7 +10,7 @@ import type { SamlPreferences } from './types/samlPreferences';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { FlowResult } from 'samlify/types/src/flow';
 import type { SamlAttributeMapping } from './types/samlAttributeMapping';
-import { SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
+import { SAML_ENTERPRISE_FEATURE_ENABLED, SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
 import {
 	isEmailCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
@@ -52,7 +52,10 @@ export function setSamlLoginLabel(label: string): void {
 
 export function isSamlLicensed(): boolean {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSamlEnabled();
+	return (
+		isUserManagementEnabled() &&
+		(license.isSamlEnabled() || config.getEnv(SAML_ENTERPRISE_FEATURE_ENABLED))
+	);
 }
 
 export function isSamlLicensedAndEnabled(): boolean {