Revert "saas-1569 - auth to sdk (#298)" (#304)

This reverts commit e0a1d7e

Author: yaroslav-codefresh

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.13.0-alpine
+FROM node:9.2.0-alpine
 
 RUN apk add --update git curl jq py-pip && pip install yq
 

codefresh-release.yml

@@ -5,7 +5,7 @@ steps:
 
   fail_if_not_master:
     title: "Validate running on master branch"
-    image: codefresh/build-cli
+    image: codefresh/cli-build
     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/build-cli
+    image: codefresh/cli-build
     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/build-cli
+    image: codefresh/cli-build
     commands:
       - "yarn install"
       - "yarn generate-completion"
@@ -53,21 +53,21 @@ steps:
 
   compile_executables:
     title: "Compiling executables"
-    image: codefresh/build-cli
+    image: codefresh/cli-build
     commands:
       - "rm -rf dist"
       - "yarn pkg"
 
   create_release:
     title: "Create github release"
-    image: codefresh/build-cli
+    image: codefresh/cli-build
     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/build-cli
+    image: codefresh/cli-build
     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,7 +76,7 @@ steps:
 
   upload_executables:
     title: "Upload executables to github release"
-    image: codefresh/cli-build # todo: move to new codefresh/build-cli
+    image: codefresh/cli-build
     commands:
 # delete all previous .zip/.gz created files
       - "rm -rf *.gz"
@@ -119,7 +119,7 @@ steps:
 
   update_brew_formula:
     title: "Updating homebrew formula"
-    image: codefresh/build-cli
+    image: codefresh/cli-build
     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

codefresh.yml

@@ -5,19 +5,19 @@ steps:
 
   install_dependencies:
     title: 'Installing testing dependencies'
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:8.8.0
     commands:
         - yarn install --frozen-lockfile
 
   eslint:
     title: 'Running linting logic'
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:8.8.0
     commands:
         - yarn eslint
 
   unit-tests:
     title: 'Running unit tests'
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:8.8.0
     commands:
         - yarn test
 

lib/interface/cli/Command.js

@@ -1,9 +1,10 @@
 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 {
@@ -74,17 +75,18 @@ class Command {
 
                 if (subCommand.isBetaCommand()) {
                     // load beta commands only if authentication exists and it is beta enabled
-                    const currentContext = sdk.config && sdk.config.context;
+                    const currentContext = authManager.getCurrentContext();
                     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 = sdk.config && sdk.config.context;
+                    const currentContext = authManager.getCurrentContext();
                     if (currentContext && currentContext.isOnPremFeatEnabled()) {
                         yargs.command(subCommand.toCommand());
                     }
-                } else {
+                }
+                else {
                     yargs.command(subCommand.toCommand());
                 }
             });

lib/interface/cli/codefresh

@@ -13,13 +13,62 @@ process.on('unhandledRejection', (err) => {
 });
 
 if (process.argv.includes('--get-yargs-completions')) {
-    const completionInterface = require('./completion');
-    completionInterface().argv; // eslint-disable-line
+    const initCompletion = require('./completion');
+    initCompletion().argv;
 } else {
-    const commandLineInterface = require('./commad-line-interface');
-    commandLineInterface().catch((err) => {
-        Output.printError(err);
-        process.exit(1);
+    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;
     });
 }
 

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

@@ -1,7 +1,34 @@
+const debug = require('debug')('codefresh:auth:login');
 const Command = require('../../Command');
+const _ = require('lodash');
+const CFError = require('cf-errors');
 const DEFAULTS = require('../../defaults');
-const { Config } = require('codefresh-sdk');
+const { auth } = require('../../../../logic');
+const { JWTContext, APIKeyContext } = auth.contexts;
+const authManager = auth.manager;
 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]',
@@ -13,7 +40,7 @@ const command = new Command({
         title: 'Create Context',
         weight: 20,
     },
-    builder: (yargs) => { // eslint-disable-line
+    builder: (yargs) => {
         return yargs
             .option('url', {
                 describe: 'Codefresh system custom url',
@@ -29,25 +56,38 @@ 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 configManager = Config.manager();
-        await configManager.loadConfig({ configFilePath: argv.cfconfig });
+        const authContext = await _loginWithToken(argv.url, argv['api-key']);
+        const userData = await authContext.validate();
+        const roles = _.get(userData,'roles');
 
-        const updatedExistingContext = configManager.getContextByName(argv.name);
+        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 context = await configManager.createContext({ apiKey: argv.apiKey, url: argv.url, name: argv.name });
-        configManager.addContext(context);
-        configManager.setCurrentContext(context);
-        await configManager.persistConfig();
+        await authManager.addContext(authContext);
+        await authManager.setCurrentContext(authContext);
+        await authManager.persistContexts(authContext);
+        await createContext();
 
         if (updatedExistingContext) {
-            console.log(`Updated context: ${context.name}`);
+            console.log(`Updated context: ${authContext.name}`);
         } else {
-            console.log(`Created new context: ${context.name}`);
+            console.log(`Created new context: ${authContext.name}`);
         }
 
-        console.log(`Switched to context: ${context.name}`);
+        console.log(`Switched to context: ${authContext.name}`);
     },
 });
 

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

@@ -1,7 +1,11 @@
+const debug = require('debug')('codefresh:auth:current-context');
 const Command = require('../../Command');
+const CFError = require('cf-errors');
+const { auth } = require('../../../../logic');
+const authManager = auth.manager;
 const authRoot = require('../root/auth.cmd');
-const { Config } = require('codefresh-sdk');
 const { printTableForAuthContexts } = require('../../helpers/auth');
+const _ = require('lodash');
 
 const command = new Command({
     command: 'current-context',
@@ -17,7 +21,6 @@ const command = new Command({
             .example('codefresh auth current-context', 'Show active authentication context');
     },
     handler: async (argv) => {
-        await Config.manager().loadConfig({ configFilePath: argv.cfconfig });
         await printTableForAuthContexts({ filter: 'current' });
     },
 });