@dynamicweb/cli 1.0.2 → 1.0.4

package/bin/commands/env.js

@@ -40,15 +40,27 @@ export function envCommand() {
 }
 
 export async function setupEnv(argv) {
-    let env;
-    if (getConfig().env) {
+    let env = {};
+    let askEnv = true;
+
+    if (argv.host) {
+        askEnv = false;
+        env.host = argv.host;
+        if (argv.protocol) {
+            env.protocol = argv.protocol;
+        } else {
+            env.protocol = 'https';
+        }
+    }
+
+    if (askEnv && getConfig().env) {
         env = getConfig().env[argv.env] || getConfig().env[getConfig()?.current?.env];
         if (!env.protocol) {
             console.log('Protocol for environment not set, defaulting to https');
             env.protocol = 'https';
         }
     }
-    if (!env) {
+    else if (askEnv) {
         console.log('Current environment not set, please set it')
         await interactiveEnv(argv, {
             environment: {

package/bin/commands/files.js

@@ -194,6 +194,7 @@ async function download(env, user, dirPath, outPath, recursive, outname, raw, ia
     let excludeDirectories = '';
     if (!iamstupid) {
         excludeDirectories = 'system/log';
+        console.log(dirPath)
         if (dirPath === 'cache.net') {
             return;
         }
@@ -213,7 +214,8 @@ async function download(env, user, dirPath, outPath, recursive, outname, raw, ia
     console.log('Downloading', dirPath === '/.' ? 'Base' : dirPath, 'Recursive=' + recursive);
 
     let filename;
-    
+    console.log(data)
+    console.log(`${env.protocol}://${env.host}/Admin/Api/${endpoint}`)
     fetch(`${env.protocol}://${env.host}/Admin/Api/${endpoint}`, {
         method: 'POST',
         body: JSON.stringify(data),
@@ -274,7 +276,7 @@ export async function uploadFiles(env, user, localFilePaths, destinationPath, cr
         console.log(localPath)
         form.append('files', fs.createReadStream(path.resolve(localPath)));
     });
-    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/Upload?` + new URLSearchParams({"createEmptyFiles": createEmpty}), {
+    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/Upload?` + new URLSearchParams({"createEmptyFiles": createEmpty, "createMissingDirectories": true}), {
         method: 'POST',
         body: form,
         headers: {
@@ -288,6 +290,7 @@ export async function uploadFiles(env, user, localFilePaths, destinationPath, cr
     }
     else {
         console.log(res)
+        console.log(res.json())
         return;
     }
 }

package/bin/commands/login.js

@@ -18,11 +18,24 @@ export function loginCommand() {
 }
 
 export async function setupUser(argv, env) {
-    let user;
-    if (env.users) {
+    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 (!user) {
+
+    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: {
@@ -42,6 +55,7 @@ export async function setupUser(argv, env) {
         })
         user = env.users[env.current.user];
     }
+
     return user;
 }
 

package/bin/index.js

@@ -31,6 +31,15 @@ yargs(hideBin(process.argv))
         type: 'boolean',
         description: 'Run with verbose logging'
     })
+    .option('protocol', {
+        description: 'Allows setting the protocol used, only used together with --host, defaulting to https'
+    })
+    .option('host', {
+        description: 'Allows setting the host used, only allowed if an --apiKey is specified'
+    })
+    .option('apiKey', {
+        description: 'Allows setting the apiKey for an environmentless execution of the CLI command'
+    })
     .demandCommand()
     .parse()
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@dynamicweb/cli",
   "type": "module",
   "description": "Dynamicweb CLI is a commandline tool for interacting with Dynamicweb 10 solutions.",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "bin/index.js",
   "files": [
     "bin/*"