Fix initial authentication issue (#91)

Author: ziv-codefresh

lib/interface/cli/Command.js

@@ -9,7 +9,9 @@ class Command {
     constructor(command) {
         this.root = command.root;
         delete command.root;
-
+        if (command.hasOwnProperty('requiresAuthentication')) {
+            this.requiresAuthentication = command.requiresAuthentication;
+        }
         this.betaCommand = command.betaCommand || false;
         this.command = command;
         this.subCommands = [];
@@ -43,17 +45,25 @@ class Command {
 
     toCommand() {
         let command = this.command;
-        //assert(_.get(this.command, "builder", true));
 
         let funcs = _.map(this.builders, (b) => {
             return (yargs) => {
                 b(yargs);
                 _.forEach(this.subCommands, (subCommand) => {
-                    // TODO use .toCommand here too
-                    if (subCommand instanceof Command && (!subCommand.isBetaCommand() || authManager.getCurrentContext().isBetaFeatEnabled())) {
-                        yargs.command(subCommand.toCommand());
+                    if (!subCommand.hasOwnProperty('requiresAuthentication') && command.hasOwnProperty('requiresAuthentication')) {
+                        subCommand.requiresAuthentication = command.requiresAuthentication;
+                    } else {
+                        subCommand.requiresAuthentication = true;
+                    }
+
+                    if (subCommand.isBetaCommand()) {
+                        // load beta commands only if authentication exists and it is beta enabled
+                        const currentContext = authManager.getCurrentContext();
+                        if (currentContext && currentContext.isBetaFeatEnabled()) {
+                            yargs.command(subCommand.toCommand());
+                        }
                     } else {
-                        yargs.command(subCommand);
+                        yargs.command(subCommand.toCommand());
                     }
                 });
                 return yargs;
@@ -65,7 +75,7 @@ class Command {
         };
 
         command.builder = builder;
-        command.handler = wrapHandler(command.handler);
+        command.handler = wrapHandler(command.handler, this.requiresAuthentication);
         return command;
 
     }

lib/interface/cli/codefresh

@@ -30,15 +30,18 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
         .config('cfconfig', 'Custom path for authentication contexts config file', (configFilePath) => {
             try {
                 authManager.loadContexts(configFilePath, process.env.CF_API_KEY, process.env.CF_URL || DEFAULTS.URL);
-                if (_.isEmpty(authManager.getAllContexts())) {
-                    printError('Unauthorized error: Please create an authentication context (see codefresh auth create-context --help)');
-                    //process.exit(1);
-                }
                 _.forEach(files, (file) => {
                     if (file.endsWith('.cmd.js')) {
                         const command = require(file);
-                        if (command.isRoot() && (!command.isBetaCommand() || authManager.getCurrentContext().beta)) {
-                            rootCommands.push(command);
+                        if (command.isRoot()) {
+                            if (command.isBetaCommand()) {
+                                const currentContext = authManager.getCurrentContext();
+                                if (currentContext && currentContext.isBetaFeatEnabled()) {
+                                    rootCommands.push(command);
+                                }
+                            } else {
+                                rootCommands.push(command);
+                            }
                         }
                     }
                 });
@@ -65,7 +68,7 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
 \\____|\\___/ \\__,_|\\___|_|  _|  \\___|____/_| |_| \\____|_____|___|
  
  
-For more information, find our official documentation at http://cli.codefresh.io                                                                
+For more information, find our official documentation at https://github.com/codefresh-io/cli                                                                
 `)
         // .option('help', {
         //     global: false,

lib/interface/cli/commands/root/auth.cmd.js

@@ -2,6 +2,7 @@ const Command = require('../../Command');
 
 const auth = new Command({
     root: true,
+    requiresAuthentication: false,
     command: 'auth',
     description: 'Manage authentication contexts',
     builder: (yargs) => {

lib/interface/cli/commands/root/version.cmd.js

@@ -3,6 +3,7 @@ const cliPackage = require('./../../../../../package.json');
 
 const version = new Command({
     root: true,
+    requiresAuthentication: false,
     command: 'version',
     description: 'Print version',
     builder: (yargs) => {

lib/interface/cli/helpers/general.js

@@ -15,9 +15,15 @@ const printError = (error) => {
     }
 };
 
-const wrapHandler = (handler) => {
+const wrapHandler = (handler, requiresAuthentication) => {
     return async (argv) => {
         try {
+            const authManager = require('../../../logic').auth.manager;
+            if (requiresAuthentication && !authManager.getCurrentContext()) {
+                printError('Authentication error: Please create an authentication context (see codefresh auth create-context --help)');
+                process.exit(1);
+            }
+
             if (!argv.watch) {
                 await handler(argv);
                 return;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,