From ee5895f5344d600c780a4c07c77ef195887ac471 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Wed, 12 Jul 2017 23:31:29 -0600
Subject: [PATCH] Fix #5488 Support scoped plugin npm packages

---
 public/src/admin/extend/plugins.js |  4 +-
 src/plugins.js                     | 84 +++++++++++++++++++++---------
 2 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
index 9622b4fbc0..dbc722aa2a 100644
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@@ -20,7 +20,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t
 		pluginsList.on('click', 'button[data-action="toggleActive"]', function () {
 			var pluginEl = $(this).parents('li');
 			pluginID = pluginEl.attr('data-plugin-id');
-			var btn = $('#' + pluginID + ' [data-action="toggleActive"]');
+			var btn = $('[id="' + pluginID + '"] [data-action="toggleActive"]');
 			socket.emit('admin.plugins.toggleActive', pluginID, function (err, status) {
 				if (err) {
 					return app.alertError(err);
@@ -30,7 +30,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t
 					btn.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active);
 
 					// clone it to active plugins tab
-					if (status.active && !$('#active #' + pluginID).length) {
+					if (status.active && !$('#active [id="' + pluginID + '"]').length) {
 						$('#active ul').prepend(pluginEl.clone(true));
 					}
 
diff --git a/src/plugins.js b/src/plugins.js
index 7c758c517a..de328887eb 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -298,38 +298,74 @@ Plugins.normalise = function (apiReturn, callback) {
 };
 
 Plugins.showInstalled = function (callback) {
-	var npmPluginPath = path.join(__dirname, '../node_modules');
+	var nodeModulesPath = path.join(__dirname, '../node_modules');
+	var pluginNamePattern = /^(@.*?\/)?nodebb-(theme|plugin|widget|rewards)-.*$/;
 
 	async.waterfall([
-		async.apply(fs.readdir, npmPluginPath),
-
+		function (next) {
+			fs.readdir(nodeModulesPath, next);
+		},
 		function (dirs, next) {
-			dirs = dirs.filter(function (dir) {
-				return dir.startsWith('nodebb-plugin-') ||
-					dir.startsWith('nodebb-widget-') ||
-					dir.startsWith('nodebb-rewards-') ||
-					dir.startsWith('nodebb-theme-');
-			}).map(function (dir) {
-				return path.join(npmPluginPath, dir);
-			});
+			var pluginPaths = [];
 
-			async.filter(dirs, function (dir, callback) {
-				fs.stat(dir, function (err, stats) {
-					if (err) {
-						if (err.code === 'ENOENT') {
-							return callback(null, false);
-						}
-						return callback(err);
-					}
-					callback(null, stats.isDirectory());
-				});
-			}, next);
+			async.each(dirs, function (dirname, next) {
+				var dirPath = path.join(nodeModulesPath, dirname);
+
+				async.waterfall([
+					function (cb) {
+						fs.stat(dirPath, function (err, stats) {
+							if (err && err.code !== 'ENOENT') {
+								return next(err);
+							}
+							if (err || !stats.isDirectory()) {
+								return next();
+							}
+
+							if (pluginNamePattern.test(dirname)) {
+								pluginPaths.push(dirname);
+								return next();
+							}
+
+							if (dirname[0] !== '@') {
+								return next();
+							}
+							fs.readdir(dirPath, cb);
+						});
+					},
+					function (subdirs, cb) {
+						async.each(subdirs, function (subdir, next) {
+							if (!pluginNamePattern.test(subdir)) {
+								return next();
+							}
+
+							var subdirPath = path.join(dirPath, subdir);
+							fs.stat(subdirPath, function (err, stats) {
+								if (err && err.code !== 'ENOENT') {
+									return next(err);
+								}
+
+								if (err || !stats.isDirectory()) {
+									return next();
+								}
+
+								pluginPaths.push(dirname + '/' + subdir);
+								next();
+							});
+						}, cb);
+					},
+				], next);
+			}, function (err) {
+				next(err, pluginPaths);
+			});
 		},
 
-		function (files, next) {
+		function (dirs, next) {
+			dirs = dirs.map(function (dir) {
+				return path.join(nodeModulesPath, dir);
+			});
 			var plugins = [];
 
-			async.each(files, function (file, next) {
+			async.each(dirs, function (file, next) {
 				async.waterfall([
 					function (next) {
 						Plugins.loadPluginInfo(file, next);