feature(cloudcmd) add --no-config-dialog: add ability to hide config …

…dialog (#65)
coderaiser · Nov 9, 2016 · b4c5b5a · b4c5b5a
1 parent 0f79fc3
commit b4c5b5a
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 32 deletions.
diff --git a/HELP.md b/HELP.md
@@ -76,13 +76,15 @@ Cloud Commander supports command line parameters:
 | `--progress`                  | show progress of file operations
 | `--open`                      | open web browser when server started
 | `--one-panel-mode`            | set one panel mode
+  `--config-dialog`             | enable config dialog
 | `--no-server`                 | do not start server
 | `--no-auth`                   | disable authorization
 | `--no-online`                 | load scripts from local server
 | `--no-open`                   | do not open web browser when server started
 | `--no-minify`                 | disable minification
 | `--no-progress`               | do not show progress of file operations
 | `--no-one-panel-mode`         | unset one panel mode
+| `--no-config-dialog`          | disable config dialog
 
 If no parameters given Cloud Commander reads information from `~/.cloudcmd.json` and use
 port from it (`8000` default). if port variables `PORT` or `VCAP_APP_PORT` isn't exist.

diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
@@ -32,6 +32,7 @@ var Info        = require('../package'),
             'open',
             'minify',
             'progress',
+            'config-dialog',
             'one-panel-mode'
         ],
         default: {
@@ -47,6 +48,7 @@ var Info        = require('../package'),
             prefix      : config('prefix') || '',
             progress    : config('progress'),
 
+            'config-dialog': defaultTrue(config('configDialog')),
             'one-panel-mode': config('onePanelMode'),
         },
         alias: {
@@ -85,6 +87,7 @@ if (args.version) {
     config('prefix', args.prefix);
     config('root', args.root);
     config('onePanelMode', args['one-panel-mode']);
+    config('configDialog', args['config-dialog']);
 
     readConfig(args.config);
 
@@ -107,6 +110,13 @@ if (args.version) {
         });
 }
 
+function defaultTrue(value) {
+    if (typeof value === 'undefined')
+        return true;
+
+    return value;
+}
+
 function validateRoot(root) {
     var validate = require('../lib/server/validate');
     validate.root(root, console.log);

diff --git a/json/config.json b/json/config.json
@@ -20,5 +20,6 @@
     "root": "/",
     "prefix": "",
     "progress": true,
-    "onePanelMode": false
+    "onePanelMode": false,
+    "configDialog": true
 }
diff --git a/json/help.json b/json/help.json
@@ -14,12 +14,14 @@
     "--minify                   ": "enable minification",
     "--progress                 ": "show progress of file operations",
     "--one-panel-mode           ": "set one panel mode",
+    "--config-dialog            ": "enable config dialog",
     "--open                     ": "open web browser when server started",
     "--no-server                ": "do not start server",
     "--no-auth                  ": "disable authorization",
     "--no-online                ": "load scripts from local server",
     "--no-open                  ": "do not open web browser when server started",
     "--no-minify                ": "disable minification",
     "--no-progress              ": "do not show progress of file operations",
-    "--no-one-panel-mode        ": "unset one panel mode"
+    "--no-one-panel-mode        ": "unset one panel mode",
+    "--no-config-dialog         ": "disable config dialog"
 }
diff --git a/lib/client/config.js b/lib/client/config.js
@@ -293,7 +293,16 @@ var CloudCmd, Util, DOM, io;
             }
         }
 
-        init();
+        DOM.Files.get('config', function(error, config) {
+            if (error)
+                return Dialog.alert(TITLE, error);
+
+            if (!config.configDialog)
+                return;
+
+            init();
+        });
     }
 
 })(CloudCmd, Util, DOM);
+
diff --git a/lib/server/config.js b/lib/server/config.js
@@ -48,11 +48,10 @@ module.exports          = manage;
 module.exports.save     = save;
 module.exports.middle   = middle;
 module.exports.listen   = function(socket, authCheck) {
-    if (!socket)
-        throw Error('socket could not be empty!');
+    check(socket, authCheck);
 
-    if (authCheck && typeof authCheck !== 'function')
-        throw Error('authCheck should be function!');
+    if (!manage('configDialog'))
+        return middle;
 
     listen(socket, authCheck);
 
@@ -115,6 +114,8 @@ function connection(socket) {
 }
 
 function middle(req, res, next) {
+    var noConfigDialog = !manage('configDialog');
+
     if (req.url !== apiURL + '/config') {
         next();
     } else {
@@ -124,6 +125,11 @@ function middle(req, res, next) {
             break;
 
         case 'PATCH':
+            if (noConfigDialog)
+                return res
+                    .status(404)
+                    .send('Config is disabled');
+
             patch(req, res, next);
             break;
 
@@ -190,3 +196,11 @@ function cryptoPass(json) {
         json.password = criton(json.password, algo);
 }
 
+function check(socket, authCheck) {
+    if (!socket)
+        throw Error('socket could not be empty!');
+
+    if (authCheck && typeof authCheck !== 'function')
+        throw Error('authCheck should be function!');
+}
+
diff --git a/lib/server/route.js b/lib/server/route.js
@@ -48,6 +48,8 @@ var DIR         = __dirname + '/../../',
         }).join(':');
 
 module.exports = function(req, res, next) {
+    check(req, res, next);
+
     readFiles(function() {
         route(req, res, next);
     });
@@ -62,6 +64,7 @@ function indexProcessing(options) {
         right       = '',
         keysPanel   = '<div id="js-keyspanel" class="{{ className }}',
         isOnePanel  = config('onePanelMode'),
+        isConfig    = config('configDialog'),
         data        = options.data,
         panel       = options.panel;
 
@@ -82,6 +85,10 @@ function indexProcessing(options) {
             .replace('icon-move', 'icon-move none')
             .replace('icon-copy', 'icon-copy none');
 
+   if (!isConfig)
+        data = data
+            .replace('icon-config', 'icon-config none');
+
     left = rendy(Template.panel, {
         side        : 'left',
         content     : panel,
@@ -96,10 +103,10 @@ function indexProcessing(options) {
         });
 
     data = rendy(data, {
-        title   : CloudFunc.getTitle(),
-        fm      : left + right,
-        prefix  : prefix(),
-        css     : CSS_URL
+        title: CloudFunc.getTitle(),
+        fm: left + right,
+        prefix: prefix(),
+        css: CSS_URL
     });
 
     return data;
@@ -148,15 +155,6 @@ function readFiles(callback) {
 function route(request, response, callback) {
     var name, p, isAuth, isFS, fullPath;
 
-    if (!request)
-        throw Error('request could not be empty!');
-
-    if (!response)
-        throw Error('response could not be empty!');
-
-    if (typeof callback !== 'function')
-        throw Error('callback should be function!');
-
     name    = ponse.getPathName(request);
 
     isAuth  = RegExp('^(/auth|/auth/github)$').test(name);
@@ -233,3 +231,14 @@ function buildIndex(json, callback) {
             minify(PATH_INDEX, 'name', callback);
     });
 }
+
+function check(req, res, next) {
+    if (!req)
+        throw Error('req could not be empty!');
+
+    if (!res)
+        throw Error('res could not be empty!');
+
+    if (typeof next !== 'function')
+        throw Error('next should be function!');
+}
diff --git a/man/cloudcmd.1 b/man/cloudcmd.1
@@ -38,13 +38,15 @@ programs in browser from any computer, mobile or tablet device.
   --progress                    show progress of file operations
   --open                        open web browser when server started
   --one-panel-mode              set one panel mode
+  --config-dialog               enable config dialog
   --no-auth                     disable authorization
   --no-server                   do not start server
   --no-online                   load scripts from local server
   --no-open                     do not open web browser when server started
   --no-minify                   disable minification
   --no-progress                 do not show progress of file operations
   --no-one-panel-mode           unset one panel mode
+  --no-config-dialog            disable config dialog
 
 .SH RESOURCES AND DOCUMENTATION
 

diff --git a/test/before.js b/test/before.js
@@ -8,6 +8,7 @@ const writejson = require('writejson');
 const readjson = require('readjson');
 
 const cloudcmd = require('..');
+const {assign} = Object;
 
 const pathConfig = os.homedir() + '/.cloudcmd.json';
 const currentConfig = readjson.sync.try(pathConfig);
@@ -23,14 +24,18 @@ module.exports = (config, fn = config) => {
     };
 
     app.use(cloudcmd({
-        config: {
-            auth: false,
-            root: __dirname
-        }
+        config: assign(defaultConfig(), config)
     }));
 
     server.listen(() => {
         fn(server.address().port, after);
     });
 };
 
+function defaultConfig() {
+    return {
+        auth: false,
+        root: __dirname
+    };
+}
+
diff --git a/test/rest/config.js b/test/rest/config.js
@@ -35,16 +35,39 @@ test('cloudcmd: rest: config: get', (t) => {
     });
 });
 
-test('cloudcmd: rest: config: put', (t) => {
-    before((port, after) => {
-        patch(`http://localhost:${port}/api/v1/config`, {
-            json: {
-                auth: false
-            }
-        })
+test('cloudcmd: rest: config: patch', (t) => {
+    const configDialog = true;
+
+    before({configDialog}, (port, after) => {
+        const json = {
+            auth: false,
+        };
+
+        patch(`http://localhost:${port}/api/v1/config`, json)
+            .then(warp(_pullout, 'string'))
+            .then((result) => {
+                t.equal(result, 'config: ok("auth")', 'should patch config');
+                t.end();
+                after();
+            })
+            .catch((error) => {
+                console.log(error);
+            });
+    });
+});
+
+test('cloudcmd: rest: config: patch: no configDialog', (t) => {
+    const configDialog = false;
+
+    before({configDialog}, (port, after) => {
+        const json = {
+            ip: null
+        };
+
+        patch(`http://localhost:${port}/api/v1/config`, json)
             .then(warp(_pullout, 'string'))
             .then((result) => {
-                t.equal(result, 'config: ok("json")', 'should patch config');
+                t.equal(result, 'Config is disabled', 'should return error');
                 t.end();
                 after();
             })
@@ -54,3 +77,25 @@ test('cloudcmd: rest: config: put', (t) => {
     });
 });
 
+test('cloudcmd: rest: config: patch: no configDialog: statusCode', (t) => {
+    const configDialog = false;
+
+    before({configDialog}, (port, after) => {
+        const json = {
+            ip: null
+        };
+
+        patch(`http://localhost:${port}/api/v1/config`, json)
+            .then((result) => {
+                result.on('response', (response) => {
+                    t.equal(response.statusCode, 404);
+                    t.end();
+                    after();
+                });
+            })
+            .catch((error) => {
+                console.log(error);
+            });
+    });
+});
+