move nodes routes to a controller class

n8n-io · Mar 6, 2023 · e36aacc · e36aacc
1 parent a6d7b42
commit e36aacc
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 156 deletions.
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
@@ -59,7 +59,6 @@ import config from '@/config';
 import * as Queue from '@/Queue';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
-import { nodesController } from '@/api/nodes.api';
 import { workflowsController } from '@/workflows/workflows.controller';
 import {
 	EDITOR_UI_DIST_DIR,
@@ -85,6 +84,7 @@ import {
 	AuthController,
 	LdapController,
 	MeController,
+	NodesController,
 	NodeTypesController,
 	OwnerController,
 	PasswordResetController,
@@ -401,6 +401,12 @@ class Server extends AbstractServer {
 			controllers.push(new LdapController(service, sync, internalHooks));
 		}
 
+		if (config.getEnv('nodes.communityPackages.enabled')) {
+			controllers.push(
+				new NodesController(config, this.loadNodesAndCredentials, this.push, internalHooks),
+			);
+		}
+
 		controllers.forEach((controller) => registerController(app, config, controller));
 	}
 
@@ -486,13 +492,6 @@ class Server extends AbstractServer {
 
 		this.app.use(`/${this.restEndpoint}/credentials`, credentialsController);
 
-		// ----------------------------------------
-		// Packages and nodes management
-		// ----------------------------------------
-		if (config.getEnv('nodes.communityPackages.enabled')) {
-			this.app.use(`/${this.restEndpoint}/nodes`, nodesController);
-		}
-
 		// ----------------------------------------
 		// Workflow
 		// ----------------------------------------

diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
@@ -1,6 +1,7 @@
 export { AuthController } from './auth.controller';
 export { LdapController } from './ldap.controller';
 export { MeController } from './me.controller';
+export { NodesController } from './nodes.controller';
 export { NodeTypesController } from './nodeTypes.controller';
 export { OwnerController } from './owner.controller';
 export { PasswordResetController } from './passwordReset.controller';