@dynamicweb/cli 1.0.15 → 1.1.0

package/bin/commands/install.js

@@ -1,64 +1,65 @@
-import fetch from 'node-fetch';
-import path from 'path';
-import { setupEnv, getAgent } from './env.js';
-import { setupUser } from './login.js';
-import { uploadFiles, resolveFilePath } from './files.js';
-
-export function installCommand() {
-    return {
-        command: 'install [filePath]', 
-        describe: 'Installs the addin on the given path, allowed file extensions are .dll, .nupkg', 
-        builder: (yargs) => {
-            return yargs
-            .positional('filePath', {
-                describe: 'Path to the file to install'
-            })
-            .option('queue', {
-                alias: 'q',
-                type: 'boolean',
-                describe: 'Queues the install for next Dynamicweb recycle'
-            })
-        },
-        handler: (argv) => {
-            if (argv.verbose) console.info(`Installing file located at :${argv.filePath}`)
-            handleInstall(argv)
-        }
-    }
-}
-
-async function handleInstall(argv) {
-    let env = await setupEnv(argv);
-    let user = await setupUser(argv, env);
-    await uploadFiles(env, user, [ argv.filePath ], 'System/AddIns/Local', false, true);
-    await installAddin(env, user, resolveFilePath(argv.filePath), argv.queue)
-}
-
-async function installAddin(env, user, resolvedPath, queue) {
-    console.log('Installing addin')
-    let filename = path.basename(resolvedPath);
-    let data = {
-        'Queue': queue,
-        'Ids': [
-            `${filename.substring(0, filename.lastIndexOf('.')) || filename}|${path.extname(resolvedPath)}`
-        ]
-    }
-    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/AddinInstall`, {
-        method: 'POST',
-        body: JSON.stringify(data),
-        headers: {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer ${user.apiKey}`
-        },
-        agent: getAgent(env.protocol)
-    });
-
-    if (res.ok) {
-        if (env.verbose) console.log(await res.json())
-        console.log(`Addin installed`)
-    }
-    else {
-        console.log('Request failed, returned error:')
-        console.log(await res.json())
-        process.exit(1);
-    }
+import fetch from 'node-fetch';
+import path from 'path';
+import { setupEnv, getAgent } from './env.js';
+import { setupUser } from './login.js';
+import { uploadFiles, resolveFilePath } from './files.js';
+
+export function installCommand() {
+    return {
+        command: 'install [filePath]', 
+        describe: 'Installs the addin on the given path, allowed file extensions are .dll, .nupkg', 
+        builder: (yargs) => {
+            return yargs
+            .positional('filePath', {
+                describe: 'Path to the file to install'
+            })
+            .option('queue', {
+                alias: 'q',
+                type: 'boolean',
+                describe: 'Queues the install for next Dynamicweb recycle'
+            })
+        },
+        handler: async (argv) => {
+            if (argv.verbose) console.info(`Installing file located at :${argv.filePath}`)
+            await handleInstall(argv)
+        }
+    }
+}
+
+async function handleInstall(argv) {
+    let env = await setupEnv(argv);
+    let user = await setupUser(argv, env);
+    let resolvedPath = resolveFilePath(argv.filePath);
+    await uploadFiles(env, user, [ resolvedPath ], 'System/AddIns/Local', false, true);
+    await installAddin(env, user, resolvedPath, argv.queue)
+}
+
+async function installAddin(env, user, resolvedPath, queue) {
+    console.log('Installing addin')
+    let filename = path.basename(resolvedPath);
+    let data = {
+        'Queue': queue,
+        'Ids': [
+            `${filename.substring(0, filename.lastIndexOf('.')) || filename}|${path.extname(resolvedPath)}`
+        ]
+    }
+    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/AddinInstall`, {
+        method: 'POST',
+        body: JSON.stringify(data),
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${user.apiKey}`
+        },
+        agent: getAgent(env.protocol)
+    });
+
+    if (res.ok) {
+        if (env.verbose) console.log(await res.json())
+        console.log(`Addin installed`)
+    }
+    else {
+        console.log('Request failed, returned error:')
+        console.log(await res.json())
+        process.exit(1);
+    }
 }

package/bin/commands/login.js

@@ -1,219 +1,229 @@
-import fetch from 'node-fetch';
-import { interactiveEnv, getAgent } from './env.js'
-import { updateConfig, getConfig } from './config.js';
-import yargsInteractive from 'yargs-interactive';
-
-export function loginCommand() {
-    return {
-        command: 'login [user]',
-        describe: 'If user is specified, changes the current user to the user specified, otherwise fetches an API-key that will be used to upload files and trigger addin installs, this runs with interactive mode',
-        builder: (yargs) => {
-            return yargs
-            .positional('user', {
-                describe: 'user'
-            })
-        },
-        handler: (argv) => handleLogin(argv)
-    }
-}
-
-export async function setupUser(argv, env) {
-    let user = {};
-    let askLogin = true;
-
-    if (argv.apiKey) {
-        user.apiKey = argv.apiKey;
-        askLogin = false;
-    }
-
-    if (!user.apiKey && env.users) {
-        user = env.users[argv.user] || env.users[env.current.user];
-        askLogin = false;
-    }
-
-    if (askLogin && argv.host) {
-        console.log('Please add an --apiKey to the command as overriding the host requires that.')
-        process.exit();
-    }
-    else if (askLogin) {
-        console.log('Current user not set, please login')
-        await interactiveLogin(argv, {
-            environment: {
-                type: 'input',
-                default: getConfig()?.current?.env,
-                prompt: 'never'
-              },
-              username: { 
-                type: 'input'
-              },
-              password: { 
-                type: 'password'
-              },
-              interactive: {
-                  default: true
-              }
-        })
-        user = env.users[env.current.user];
-    }
-
-    return user;
-}
-
-async function handleLogin(argv) {
-    argv.user ? changeUser(argv) : interactiveLogin(argv, {
-        environment: {
-            type: 'input',
-            default: getConfig()?.current?.env || 'dev',
-            prompt: 'if-no-arg'
-          },
-          username: { 
-            type: 'input'
-          },
-          password: { 
-            type: 'password'
-          },
-          interactive: {
-              default: true
-          }
-    })
-}
-
-export async function interactiveLogin(argv, options) {
-    if (argv.verbose) console.info('Now logging in')
-    await yargsInteractive()
-        .interactive(options)
-        .then(async (result) => {
-            if (!getConfig().env || !getConfig().env[result.environment] || !getConfig().env[result.environment].host || !getConfig().env[result.environment].protocol) {
-                if (!argv.host)
-                    console.log(`The environment specified is missing parameters, please specify them`)
-                await interactiveEnv(argv, {
-                    environment: {
-                        type: 'input',
-                        default: result.environment,
-                        prompt: 'never'
-                    },
-                    host: {
-                        describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
-                        type: 'input',
-                        prompt: 'if-no-arg'
-                    },
-                    interactive: {
-                        default: true
-                    }
-                })
-            }
-            await loginInteractive(result, argv.verbose);
-        });
-}
-
-async function loginInteractive(result, verbose) {
-    var protocol = getConfig().env[result.environment].protocol;
-    var token = await login(result.username, result.password, result.environment, protocol, verbose);
-    if (!token) return;
-    var apiKey = await getApiKey(token, result.environment, protocol, verbose)
-    if (!apiKey) return;
-    getConfig().env = getConfig().env || {};
-    getConfig().env[result.environment].users = getConfig().env[result.environment].users || {};
-    getConfig().env[result.environment].users[result.username] = getConfig().env[result.environment].users[result.username] || {};
-    getConfig().env[result.environment].users[result.username].apiKey = apiKey;
-    getConfig().env[result.environment].current = getConfig().env[result.environment].current || {};
-    getConfig().env[result.environment].current.user = result.username;
-    console.log("You're now logged in as " + result.username)
-    updateConfig();
-}
-
-async function login(username, password, env, protocol, verbose) {
-    let data = new URLSearchParams();
-    data.append('Username', username);
-    data.append('Password', password);
-    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Authentication/Login`, {
-        method: 'POST',
-        body: data,
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        agent: getAgent(protocol),
-        redirect: "manual"
-    });
-
-    if (res.ok || res.status == 302) {
-        let user = parseCookies(res.headers.get('set-cookie')).user;
-        if (!user) return;
-        return await getToken(user, env, protocol, verbose)
-    }
-    else {
-        if (verbose) console.info(res)
-        console.log(`Login attempt failed with username ${username}, please verify its a valid user in your Dynamicweb solution.`)
-    }
-}
-
-function parseCookies (cookieHeader) {
-    const list = {};
-    if (!cookieHeader) {
-        console.log(`Could not get the necessary information from the login request, please verify its a valid user in your Dynamicweb solution.`)
-        return list;
-    }
-
-    cookieHeader.replace('httponly, ', '').replace('Dynamicweb.Admin', 'user').split(`;`).forEach(cookie => {
-        let [ name, ...rest] = cookie.split(`=`);
-        name = name?.trim();
-        if (!name) return;
-        const value = rest.join(`=`).trim();
-        if (!value) return;
-        list[name] = decodeURIComponent(value);
-    });
-
-    if (!list.user) {
-        console.log(`Could not get the necessary information from the login request, please verify its a valid user in your Dynamicweb solution.`)
-    }
-
-    return list;
-}
-
-async function getToken(user, env, protocol, verbose) {
-    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Authentication/Token`, {
-        method: 'GET',
-        headers: {
-            'cookie': `Dynamicweb.Admin=${user}`
-        },
-        agent: getAgent(protocol)
-    });
-    if (res.ok) {
-        return (await res.json()).token
-    }
-    else {
-        if (verbose) console.info(res)
-        console.log(`Could not fetch the token for the logged in user ${user}, please verify its a valid user in your Dynamicweb solution.`)
-    }
-}
-
-async function getApiKey(token, env, protocol, verbose) {
-    let data = {
-        'Name': 'DW CLI',
-        'Prefix': 'CLI',
-        'Description': 'Auto-generated ApiKey by DW CLI'
-    };
-    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Api/ApiKeySave`, {
-        method: 'POST',
-        body: JSON.stringify( { 'model': data } ),
-        headers: {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer ${token}`
-        },
-        agent: getAgent(protocol)
-    });
-
-    if (res.ok) {
-        return (await res.json()).message
-    }
-    else {
-        if (verbose) console.info(res)
-        console.log(`Could not create an API Key for the logged in user, please verify its a valid user in your Dynamicweb solution.`)
-    }
-}
-
-async function changeUser(argv) {
-    getConfig().env[getConfig().current.env].current.user = argv.user;
-    updateConfig();
-    console.log(`You're now logged in as ${getConfig().env[getConfig().current.env].current.user}`);
+import fetch from 'node-fetch';
+import { interactiveEnv, getAgent } from './env.js'
+import { updateConfig, getConfig } from './config.js';
+import { input, password } from '@inquirer/prompts';
+
+export function loginCommand() {
+    return {
+        command: 'login [user]',
+        describe: 'If user is specified, changes the current user to the user specified, otherwise fetches an API-key that will be used to upload files and trigger addin installs, this runs with interactive mode',
+        builder: (yargs) => {
+            return yargs
+            .positional('user', {
+                describe: 'user'
+            })
+        },
+        handler: (argv) => handleLogin(argv)
+    }
+}
+
+export async function setupUser(argv, env) {
+    let user = {};
+    let askLogin = true;
+
+    if (argv.apiKey) {
+        user.apiKey = argv.apiKey;
+        askLogin = false;
+    }
+
+    if (!user.apiKey && env.users && (argv.user || env.current?.user)) {
+        user = env.users[argv.user] || env.users[env.current?.user];
+        askLogin = false;
+    }
+
+    if (askLogin && argv.host) {
+        console.log('Please add an --apiKey to the command as overriding the host requires that.')
+        process.exit();
+    }
+    else if (askLogin) {
+        console.log('Current user not set, please login')
+        await interactiveLogin(argv, {
+            environment: {
+                type: 'input',
+                default: getConfig()?.current?.env,
+                prompt: 'never'
+              },
+              username: { 
+                type: 'input'
+              },
+              password: { 
+                type: 'password'
+              },
+              interactive: {
+                  default: true
+              }
+        })
+        user = env.users[env.current.user];
+    }
+
+    return user;
+}
+
+async function handleLogin(argv) {
+    argv.user ? changeUser(argv) : await interactiveLogin(argv, {
+        environment: {
+            type: 'input',
+            default: getConfig()?.current?.env || 'dev',
+            prompt: 'if-no-arg'
+          },
+          username: { 
+            type: 'input'
+          },
+          password: { 
+            type: 'password'
+          },
+          interactive: {
+              default: true
+          }
+    })
+}
+
+export async function interactiveLogin(argv, options) {
+    if (argv.verbose) console.info('Now logging in')
+    const result = {};
+    for (const [key, config] of Object.entries(options)) {
+        if (key === 'interactive') continue;
+        if (config.prompt === 'never') {
+            result[key] = config.default;
+            continue;
+        }
+        const promptFn = config.type === 'password' ? password : input;
+        result[key] = await promptFn({
+            message: config.describe || key,
+            default: config.default,
+            mask: config.type === 'password' ? '*' : undefined
+        });
+    }
+    if (!getConfig().env || !getConfig().env[result.environment] || !getConfig().env[result.environment].host || !getConfig().env[result.environment].protocol) {
+        if (!argv.host)
+            console.log(`The environment specified is missing parameters, please specify them`)
+        await interactiveEnv(argv, {
+            environment: {
+                type: 'input',
+                default: result.environment,
+                prompt: 'never'
+            },
+            host: {
+                describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
+                type: 'input',
+                prompt: 'always'
+            },
+            interactive: {
+                default: true
+            }
+        })
+    }
+    await loginInteractive(result, argv.verbose);
+}
+
+async function loginInteractive(result, verbose) {
+    var protocol = getConfig().env[result.environment].protocol;
+    var token = await login(result.username, result.password, result.environment, protocol, verbose);
+    if (!token) return;
+    var apiKey = await getApiKey(token, result.environment, protocol, verbose)
+    if (!apiKey) return;
+    getConfig().env = getConfig().env || {};
+    getConfig().env[result.environment].users = getConfig().env[result.environment].users || {};
+    getConfig().env[result.environment].users[result.username] = getConfig().env[result.environment].users[result.username] || {};
+    getConfig().env[result.environment].users[result.username].apiKey = apiKey;
+    getConfig().env[result.environment].current = getConfig().env[result.environment].current || {};
+    getConfig().env[result.environment].current.user = result.username;
+    console.log("You're now logged in as " + result.username)
+    updateConfig();
+}
+
+async function login(username, password, env, protocol, verbose) {
+    let data = new URLSearchParams();
+    data.append('Username', username);
+    data.append('Password', password);
+    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Authentication/Login`, {
+        method: 'POST',
+        body: data,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        agent: getAgent(protocol),
+        redirect: "manual"
+    });
+
+    if (res.ok || res.status == 302) {
+        let user = parseCookies(res.headers.get('set-cookie')).user;
+        if (!user) return;
+        return await getToken(user, env, protocol, verbose)
+    }
+    else {
+        if (verbose) console.info(res)
+        console.log(`Login attempt failed with username ${username}, please verify its a valid user in your Dynamicweb solution.`)
+    }
+}
+
+function parseCookies (cookieHeader) {
+    const list = {};
+    if (!cookieHeader) {
+        console.log(`Could not get the necessary information from the login request, please verify its a valid user in your Dynamicweb solution.`)
+        return list;
+    }
+
+    cookieHeader.replace('httponly, ', '').replace('Dynamicweb.Admin', 'user').split(`;`).forEach(cookie => {
+        let [ name, ...rest] = cookie.split(`=`);
+        name = name?.trim();
+        if (!name) return;
+        const value = rest.join(`=`).trim();
+        if (!value) return;
+        list[name] = decodeURIComponent(value);
+    });
+
+    if (!list.user) {
+        console.log(`Could not get the necessary information from the login request, please verify its a valid user in your Dynamicweb solution.`)
+    }
+
+    return list;
+}
+
+async function getToken(user, env, protocol, verbose) {
+    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Authentication/Token`, {
+        method: 'GET',
+        headers: {
+            'cookie': `Dynamicweb.Admin=${user}`
+        },
+        agent: getAgent(protocol)
+    });
+    if (res.ok) {
+        return (await res.json()).token
+    }
+    else {
+        if (verbose) console.info(res)
+        console.log(`Could not fetch the token for the logged in user ${user}, please verify its a valid user in your Dynamicweb solution.`)
+    }
+}
+
+async function getApiKey(token, env, protocol, verbose) {
+    let data = {
+        'Name': 'DW CLI',
+        'Prefix': 'CLI',
+        'Description': 'Auto-generated ApiKey by DW CLI'
+    };
+    var res = await fetch(`${protocol}://${getConfig().env[env].host}/Admin/Api/ApiKeySave`, {
+        method: 'POST',
+        body: JSON.stringify( { 'model': data } ),
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`
+        },
+        agent: getAgent(protocol)
+    });
+
+    if (res.ok) {
+        return (await res.json()).message
+    }
+    else {
+        if (verbose) console.info(res)
+        console.log(`Could not create an API Key for the logged in user, please verify its a valid user in your Dynamicweb solution.`)
+    }
+}
+
+async function changeUser(argv) {
+    getConfig().env[getConfig().current.env].current.user = argv.user;
+    updateConfig();
+    console.log(`You're now logged in as ${getConfig().env[getConfig().current.env].current.user}`);
 }