supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1807 from thelounge/astorije/users-commands

Browse Source 
Do not load user commands or display them on `--help` if public mode or using LDAP
This commit is contained in:
Jérémie Astori 2017-12-10 14:24:55 -05:00 committed by GitHub
commit c0869b05a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command-line/index.js
View File

@ -51,11 +51,9 @@ Helper.setHome(home);
require("./start"); require("./start");
require("./config"); require("./config");
require("./list"); if (!Helper.config.public && !Helper.config.ldap.enable) {
require("./add"); require("./users");
require("./remove"); }
require("./reset");
require("./edit");
require("./install"); require("./install");
// TODO: Remove this when releasing The Lounge v3 // TODO: Remove this when releasing The Lounge v3

11
src/command-line/add.js → src/command-line/users/add.js
View File

@ -3,8 +3,8 @@
const colors = require("colors/safe"); const colors = require("colors/safe");
const program = require("commander"); const program = require("commander");
const fs = require("fs"); const fs = require("fs");
const Helper = require("../helper"); const Helper = require("../../helper");
const Utils = require("./utils"); const Utils = require("../utils");
program program
.command("add <name>") .command("add <name>")
@ -16,12 +16,7 @@ program
return; return;
} }
const ClientManager = require("../clientManager"); const ClientManager = require("../../clientManager");
if (Helper.config.public) {
log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
}
const manager = new ClientManager(); const manager = new ClientManager();
const users = manager.getUsers(); const users = manager.getUsers();

9
src/command-line/edit.js → src/command-line/users/edit.js
View File

@ -4,8 +4,8 @@ const program = require("commander");
const child = require("child_process"); const child = require("child_process");
const colors = require("colors/safe"); const colors = require("colors/safe");
const fs = require("fs"); const fs = require("fs");
const Helper = require("../helper"); const Helper = require("../../helper");
const Utils = require("./utils"); const Utils = require("../utils");
program program
.command("edit <name>") .command("edit <name>")
@ -17,9 +17,8 @@ program
return; return;
} }
const ClientManager = require("../clientManager"); const ClientManager = require("../../clientManager");
const users = new ClientManager().getUsers();
var users = new ClientManager().getUsers();
if (users === undefined) { // There was an error, already logged if (users === undefined) { // There was an error, already logged
return; return;

7
src/command-line/users/index.js Normal file
View File

@ -0,0 +1,7 @@
"use strict";
require("./list");
require("./add");
require("./remove");
require("./reset");
require("./edit");

13
src/command-line/list.js → src/command-line/users/list.js
View File

@ -3,8 +3,8 @@
const colors = require("colors/safe"); const colors = require("colors/safe");
const program = require("commander"); const program = require("commander");
const fs = require("fs"); const fs = require("fs");
const Helper = require("../helper"); const Helper = require("../../helper");
const Utils = require("./utils"); const Utils = require("../utils");
program program
.command("list") .command("list")
@ -16,13 +16,8 @@ program
return; return;
} }
const ClientManager = require("../clientManager"); const ClientManager = require("../../clientManager");
const users = new ClientManager().getUsers();
if (Helper.config.public) {
log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
}
var users = new ClientManager().getUsers();
if (users === undefined) { // There was an error, already logged if (users === undefined) { // There was an error, already logged
return; return;

6
src/command-line/remove.js → src/command-line/users/remove.js
View File

@ -3,8 +3,8 @@
const colors = require("colors/safe"); const colors = require("colors/safe");
const program = require("commander"); const program = require("commander");
const fs = require("fs"); const fs = require("fs");
const Helper = require("../helper"); const Helper = require("../../helper");
const Utils = require("./utils"); const Utils = require("../utils");
program program
.command("remove <name>") .command("remove <name>")
@ -16,7 +16,7 @@ program
return; return;
} }
const ClientManager = require("../clientManager"); const ClientManager = require("../../clientManager");
const manager = new ClientManager(); const manager = new ClientManager();
try { try {

9
src/command-line/reset.js → src/command-line/users/reset.js
View File

@ -3,8 +3,8 @@
const colors = require("colors/safe"); const colors = require("colors/safe");
const program = require("commander"); const program = require("commander");
const fs = require("fs"); const fs = require("fs");
const Helper = require("../helper"); const Helper = require("../../helper");
const Utils = require("./utils"); const Utils = require("../utils");
program program
.command("reset <name>") .command("reset <name>")
@ -16,9 +16,8 @@ program
return; return;
} }
const ClientManager = require("../clientManager"); const ClientManager = require("../../clientManager");
const users = new ClientManager().getUsers();
var users = new ClientManager().getUsers();
if (users === undefined) { // There was an error, already logged if (users === undefined) { // There was an error, already logged
return; return;