From e19cd9c11818335d2da787f597bab6c16d789657 Mon Sep 17 00:00:00 2001
From: Tei1988 <Tei1988@users.noreply.github.com>
Date: Thu, 4 Jun 2020 02:40:39 +0900
Subject: [PATCH] :sparkles: Add support for scoped npm packages (#612)

---
 packages/cli/src/LoadNodesAndCredentials.ts | 34 ++++++++++++---------
 packages/cli/src/Server.ts                  |  4 +--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 0d0eb21df3..f66fdd5e95 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -97,24 +97,28 @@ class LoadNodesAndCredentialsClass {
 	 * @memberof LoadNodesAndCredentialsClass
 	 */
 	async getN8nNodePackages(): Promise<string[]> {
-		const packages: string[] = [];
-		for (const file of await fsReaddirAsync(this.nodeModulesPath)) {
-			if (file.indexOf('n8n-nodes-') !== 0) {
-				continue;
-			}
-
-			// Check if it is really a folder
-			if (!(await fsStatAsync(path.join(this.nodeModulesPath, file))).isDirectory()) {
-				continue;
-			}
-
-			packages.push(file);
+		const getN8nNodePackagesRecursive = async (relativePath: string): Promise<string[]> => {
+			const results: string[] = [];
+			const nodeModulesPath = `${this.nodeModulesPath}/${relativePath}`;
+			for (const file of await fsReaddirAsync(nodeModulesPath)) {
+				const isN8nNodesPackage = file.indexOf('n8n-nodes-') === 0;
+				const isNpmScopedPackage = file.indexOf('@') === 0;
+				if (!isN8nNodesPackage && !isNpmScopedPackage) {
+					continue;
+				}
+				if (!(await fsStatAsync(nodeModulesPath)).isDirectory()) {
+					continue;
+				}
+				if (isN8nNodesPackage) { results.push(`${relativePath}${file}`); }
+				if (isNpmScopedPackage) {
+					results.push(...await getN8nNodePackagesRecursive(`${relativePath}${file}/`));
+				}
+			}	
+			return results;
 		}
-
-		return packages;
+		return getN8nNodePackagesRecursive('');
 	}
 
-
 	/**
 	 * Loads credentials from a file
 	 *
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index d078c8594e..6d071a85a0 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -597,8 +597,8 @@ class App {
 
 
 		// Returns the node icon
-		this.app.get('/rest/node-icon/:nodeType', async (req: express.Request, res: express.Response): Promise<void> => {
-			const nodeTypeName = req.params.nodeType;
+		this.app.get(['/rest/node-icon/:nodeType', '/rest/node-icon/:scope/:nodeType'], async (req: express.Request, res: express.Response): Promise<void> => {
+			const nodeTypeName = `${req.params.scope ? `${req.params.scope}/` : ''}${req.params.nodeType}`;
 
 			const nodeTypes = NodeTypes();
 			const nodeType = nodeTypes.getByName(nodeTypeName);