saas-1569 rework auth (#305)

* return auth changes

* update version

* lower node version + add custom sdk logic coverage

* fix build-cli on executing "upload executables"

* docs generation test + lower node versions + handle showing contexts when created from env

Author: yaroslav-codefresh

codefresh-release.yml

@@ -5,7 +5,7 @@ steps:
 
   fail_if_not_master:
     title: "Validate running on master branch"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - 'echo This pipeline should be run only on master'
       - 'exit 1'
@@ -15,7 +15,7 @@ steps:
 
   extract_version:
     title: "Exporting package.json version"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - 'export PACKAGE_VERSION=$(jq -r ".version" package.json)'
       - "echo Current version: $PACKAGE_VERSION"
@@ -40,7 +40,7 @@ steps:
 
   generate_comletion:
     title: "Generating commands completion tree"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - "yarn install"
       - "yarn generate-completion"
@@ -53,21 +53,21 @@ steps:
 
   compile_executables:
     title: "Compiling executables"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - "rm -rf dist"
       - "yarn pkg"
 
   create_release:
     title: "Create github release"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     fail_fast: false
     commands:
       - 'curl --fail -X POST -d ''{"tag_name":"v${{PACKAGE_VERSION}}","target_commitish":"${{CF_REVISION}}","name":"Codefresh V${{PACKAGE_VERSION}}"}'' -H "Content-Type: application/json" -H "Authorization: token ${{GITHUB_TOKEN}}" https://api.github.com/repos/codefresh-io/cli/releases'
 
   get_release:
     title: "Get github release"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - "curl --fail https://api.github.com/repos/codefresh-io/cli/releases/tags/v${{PACKAGE_VERSION}}"
       - "export GITHUB_RELEASE_ID=$(curl --fail https://api.github.com/repos/codefresh-io/cli/releases/tags/v${{PACKAGE_VERSION}} | jq -r '.id')"
@@ -76,11 +76,12 @@ steps:
 
   upload_executables:
     title: "Upload executables to github release"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
-# delete all previous .zip/.gz created files
+# delete all previous .zip/.gz created files and copy readme and license to ./dist
       - "rm -rf *.gz"
       - "rm -rf *.zip"
+      - "cp README.md LICENSE ./dist --force"
 # upload linux-x64 asset
       - "mv ./dist/codefresh-linux ./dist/codefresh"
       - "tar -cf codefresh-v${{PACKAGE_VERSION}}-linux-x64.tar README.md LICENSE -C ./dist ./codefresh "
@@ -119,7 +120,7 @@ steps:
 
   update_brew_formula:
     title: "Updating homebrew formula"
-    image: codefresh/cli-build
+    image: codefresh/build-cli
     commands:
       - VERSION=v${{PACKAGE_VERSION}}
       - curl -L https://github.com/codefresh-io/cli/releases/download/$VERSION/codefresh-$VERSION-macos-x64.tar.gz > $VERSION.tar.gz

docs/docs.spec.js

@@ -0,0 +1,7 @@
+const docs = require('../docs');
+
+describe('docs generation', () => {
+    it('should generate docs', async () => {
+        await docs();
+    });
+});

docs/index.js

@@ -10,7 +10,7 @@ const CFError = require('cf-errors');
 
 const TEMP_DIR = path.resolve(__dirname, '../temp');
 const TEMPLATE_DIR = path.resolve(__dirname);
-const FILES_TO_IGNORE = ['index.js'];
+const FILES_TO_IGNORE = ['index.js', 'docs.spec.js'];
 const baseDir = path.resolve(TEMP_DIR, './content');
 const ALLOW_BETA_COMMANDS = process.env.ALLOW_BETA_COMMANDS;
 const categoriesOrder = {
@@ -384,16 +384,23 @@ const createDownloadPage = async () => {
 
 };
 
+const generateDocs = async () => {
+    await deleteTempFolder();
+    await copyTemplateToTmp();
+    await createAutomatedDocs();
+    await createDownloadPage();
+};
 
 const main = async () => {
     try {
-        await deleteTempFolder();
-        await copyTemplateToTmp();
-        await createAutomatedDocs();
-        await createDownloadPage();
+        await generateDocs();
     } catch (err) {
         console.error(err.stack);
     }
 };
 
-main();
+if (require.main === module) {
+    main();
+} else {
+    module.exports = generateDocs;
+}

lib/interface/cli/Command.js

@@ -1,10 +1,9 @@
 const yargs = require('yargs');
 const CFError = require('cf-errors');
-const assert = require('assert');
 const _ = require('lodash');
 const { wrapHandler } = require('./helpers/general');
-const authManager = require('../../logic').auth.manager;
 const Output = require('../../output/Output');
+const { sdk } = require('../../logic');
 
 
 class Command {
@@ -75,18 +74,17 @@ class Command {
 
                 if (subCommand.isBetaCommand()) {
                     // load beta commands only if authentication exists and it is beta enabled
-                    const currentContext = authManager.getCurrentContext();
+                    const currentContext = sdk.config && sdk.config.context;
                     if (currentContext && currentContext.isBetaFeatEnabled()) {
                         yargs.command(subCommand.toCommand());
                     }
                 } else if (subCommand.isOnPremCommand()) {
                     // load onPrem commands only if authentication exists and it is onPrem enabled
-                    const currentContext = authManager.getCurrentContext();
+                    const currentContext = sdk.config && sdk.config.context;
                     if (currentContext && currentContext.isOnPremFeatEnabled()) {
                         yargs.command(subCommand.toCommand());
                     }
-                }
-                else {
+                } else {
                     yargs.command(subCommand.toCommand());
                 }
             });

lib/interface/cli/codefresh

@@ -13,62 +13,13 @@ process.on('unhandledRejection', (err) => {
 });
 
 if (process.argv.includes('--get-yargs-completions')) {
-    const initCompletion = require('./completion');
-    initCompletion().argv;
+    const completionInterface = require('./completion');
+    completionInterface().argv; // eslint-disable-line
 } else {
-    const _ = require('lodash');
-    const yargs = require('yargs');
-    const path = require('path');
-    const recursive = require('recursive-readdir');
-    const DEFAULTS = require('./defaults');
-    const authManager = require('../../logic').auth.manager;
-
-    recursive(path.resolve(__dirname, 'commands'), (err, files) => {
-        const rootCommands = [];
-        yargs
-            .env('')
-            .options('cfconfig', {
-                default: DEFAULTS.CFCONFIG,
-                global: false,
-            })
-            .config('cfconfig', 'Custom path for authentication contexts config file', (configFilePath) => {
-                try {
-                    authManager.loadContexts(process.env.CF_API_KEY, process.env.CF_URL || DEFAULTS.URL, configFilePath);
-                    _.forEach(files, (file) => {
-                        if (file.endsWith('.cmd.js')) {
-                            const command = require(file);
-                            if (command.isRoot()) {
-                                if (command.isBetaCommand()) {
-                                    const currentContext = authManager.getCurrentContext();
-                                    if (currentContext && currentContext.isBetaFeatEnabled()) {
-                                        rootCommands.push(command);
-                                    }
-                                } else {
-                                    rootCommands.push(command);
-                                }
-                            }
-                        }
-                    });
-                    _.forEach(rootCommands, (command) => {
-                        yargs.command(command.toCommand());
-                    });
-                } catch (err) {
-                    Output.printError(err);
-                    process.exit(1);
-                }
-            });
-
-
-        yargs // eslint-disable-line
-            .demandCommand(1, 'You need at least one command before moving on')
-            .wrap(null)
-            .version(false)
-            .help('help')
-            .epilogue('For more information, find our official documentation at http://cli.codefresh.io')
-            // .option('help', {
-            //     global: false,
-            // })
-            .argv;
+    const commandLineInterface = require('./commad-line-interface');
+    commandLineInterface().catch((err) => {
+        Output.printError(err);
+        process.exit(1);
     });
 }
 

lib/interface/cli/commad-line-interface.js

@@ -0,0 +1,76 @@
+const _ = require('lodash');
+const yargs = require('yargs');
+const path = require('path');
+const recursive = require('recursive-readdir');
+
+const DEFAULTS = require('./defaults');
+const { Config } = require('codefresh-sdk');
+const { version } = require('../../../package.json');
+const configManager = require('../../logic/cli-config/Manager');
+const openapi = require('../../../openapi');
+const sdk = require('../../logic/sdk');
+
+const PROCESS_ARGV = require('yargs-parser')(process.argv);
+
+async function startCommandLine() {
+    const cliConfig = configManager.config();
+
+    let files;
+    let config;
+
+    const configOptions = {
+        configPath: PROCESS_ARGV.cfconfig,
+        spec: { json: openapi },
+        request: _.defaultsDeep({
+            headers: {
+                'User-Agent': `codefresh-cli-v${version}`,
+                'Codefresh-Agent': 'cli',
+            },
+        }, cliConfig.request),
+    };
+
+    await Promise.all([
+        recursive(path.resolve(__dirname, 'commands')).then((result) => {
+            files = result;
+        }),
+        Config.load(configOptions).then((result) => {
+            config = result;
+        }),
+    ]);
+
+    sdk.configure(config);
+
+    const rootCommands = [];
+    _.forEach(files, (file) => {
+        if (file.endsWith('.cmd.js')) {
+            const command = require(file);
+            if (command.isRoot()) {
+                if (command.isBetaCommand()) {
+                    if (config && config.context && config.context.isBetaFeatEnabled()) {
+                        rootCommands.push(command);
+                    }
+                } else {
+                    rootCommands.push(command);
+                }
+            }
+        }
+    });
+    _.forEach(rootCommands, (command) => {
+        yargs.command(command.toCommand());
+    });
+
+    return yargs // eslint-disable-line
+        .env('')
+        .option('cfconfig', {
+            describe: `Custom path for authentication contexts config file (default: ${DEFAULTS.CFCONFIG})`,
+            global: false,
+        })
+        .demandCommand(1, 'You need at least one command before moving on')
+        .wrap(null)
+        .version(false)
+        .help('help')
+        .epilogue('For more information, find our official documentation at http://cli.codefresh.io')
+        .argv;
+}
+
+module.exports = startCommandLine;

lib/interface/cli/commands/auth/create-context.cmd.js

@@ -1,34 +1,7 @@
-const debug = require('debug')('codefresh:auth:login');
 const Command = require('../../Command');
-const _ = require('lodash');
-const CFError = require('cf-errors');
 const DEFAULTS = require('../../defaults');
-const { auth } = require('../../../../logic');
-const { JWTContext, APIKeyContext } = auth.contexts;
-const authManager = auth.manager;
+const { Config } = require('codefresh-sdk');
 const authRoot = require('../root/auth.cmd');
-const { createContext } = require('../../../../logic/api/auth');
-
-const _loginWithToken = async (url, token) => {
-    let authContext;
-    try {
-        authContext = JWTContext.createFromToken(token, url);
-        return authContext;
-
-    } catch (err) {
-        try {
-            authContext = APIKeyContext.createFromToken(token, url);
-            return authContext;
-
-        } catch (err) {
-            const error = new CFError({
-                cause: err,
-                message: 'Failed to login with api key',
-            });
-            throw error;
-        }
-    }
-};
 
 const command = new Command({
     command: 'create-context [name]',
@@ -40,7 +13,7 @@ const command = new Command({
         title: 'Create Context',
         weight: 20,
     },
-    builder: (yargs) => {
+    builder: (yargs) => { // eslint-disable-line
         return yargs
             .option('url', {
                 describe: 'Codefresh system custom url',
@@ -56,38 +29,25 @@ const command = new Command({
             })
             .example('codefresh auth create-context --api-key KEY', 'Creating a default context using KEY as the api-key')
             .example('codefresh auth create-context my-context --api-key KEY', 'Creating a named context');
-
     },
     handler: async (argv) => {
-        const authContext = await _loginWithToken(argv.url, argv['api-key']);
-        const userData = await authContext.validate();
-        const roles = _.get(userData,'roles');
+        const configManager = Config.manager();
+        await configManager.loadConfig({ configFilePath: argv.cfconfig });
 
-        if (roles.indexOf('Admin') > -1) {
-            authContext.onPrem = true;
-        }
-
-        if (argv.name) {
-            authContext.setName(argv.name);
-        }
-
-        let updatedExistingContext = false;
-        if (authManager.getContextByName(authContext.getName())) {
-            updatedExistingContext = true;
-        }
+        const updatedExistingContext = configManager.getContextByName(argv.name);
 
-        await authManager.addContext(authContext);
-        await authManager.setCurrentContext(authContext);
-        await authManager.persistContexts(authContext);
-        await createContext();
+        const context = await configManager.createContext({ apiKey: argv.apiKey, url: argv.url, name: argv.name });
+        configManager.addContext(context);
+        configManager.setCurrentContext(context);
+        await configManager.persistConfig();
 
         if (updatedExistingContext) {
-            console.log(`Updated context: ${authContext.name}`);
+            console.log(`Updated context: ${context.name}`);
         } else {
-            console.log(`Created new context: ${authContext.name}`);
+            console.log(`Created new context: ${context.name}`);
         }
 
-        console.log(`Switched to context: ${authContext.name}`);
+        console.log(`Switched to context: ${context.name}`);
     },
 });