@dynamicweb/cli 1.1.1 → 2.0.0-beta.0

package/bin/index.js

@@ -33,14 +33,30 @@ yargs(hideBin(process.argv))
         description: 'Run with verbose logging'
     })
     .option('protocol', {
-        description: 'Allows setting the protocol used, only used together with --host, defaulting to https'
+        description: 'Set the protocol used with --host (defaults to https)'
     })
     .option('host', {
-        description: 'Allows setting the host used, only allowed if an --apiKey is specified'
+        description: 'Allows setting the host used, only allowed if an --apiKey or OAuth client credentials are specified'
     })
     .option('apiKey', {
         description: 'Allows setting the apiKey for an environmentless execution of the CLI command'
     })
+    .option('auth', {
+        choices: ['user', 'oauth'],
+        description: 'Overrides the authentication mode for the command'
+    })
+    .option('clientId', {
+        description: 'OAuth client ID used together with --auth oauth'
+    })
+    .option('clientSecret', {
+        description: 'OAuth client secret used together with --auth oauth. WARNING: passing this on the command line can expose the secret via shell history and process listings. Prefer using --clientSecretEnv to reference a secret stored in an environment variable instead.'
+    })
+    .option('clientIdEnv', {
+        description: 'Environment variable name that contains the OAuth client ID'
+    })
+    .option('clientSecretEnv', {
+        description: 'Environment variable name that contains the OAuth client secret'
+    })
     .demandCommand()
     .parse()
 
@@ -49,14 +65,27 @@ function baseCommand() {
         command: '$0',
         describe: 'Shows the current env and user being used',
         handler: () => {
-            if (Object.keys(getConfig()).length === 0) {
+            const cfg = getConfig();
+            if (Object.keys(cfg).length === 0) {
                 console.log('To login to a solution use `dw login`')
                 return;
-            } 
-            console.log(`Environment: ${getConfig()?.current?.env}`)
-            console.log(`User: ${getConfig()?.env[getConfig()?.current?.env]?.current?.user}`)
-            console.log(`Protocol: ${getConfig()?.env[getConfig()?.current?.env]?.protocol}`)
-            console.log(`Host: ${getConfig()?.env[getConfig()?.current?.env]?.host}`)
+            }
+            const currentEnv = cfg?.env?.[cfg?.current?.env];
+            if (!currentEnv) {
+                console.log(`Environment '${cfg?.current?.env}' is not configured.`);
+                console.log('To login to a solution use `dw login`');
+                return;
+            }
+            const authType = currentEnv?.current?.authType;
+
+            console.log(`Environment: ${cfg?.current?.env}`);
+            if (authType === 'oauth_client_credentials') {
+                console.log('Authentication: OAuth client credentials');
+            } else if (currentEnv?.current?.user) {
+                console.log(`User: ${currentEnv.current.user}`);
+            }
+            console.log(`Protocol: ${currentEnv.protocol}`);
+            console.log(`Host: ${currentEnv.host}`);
         }
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@dynamicweb/cli",
   "type": "module",
   "description": "CLI for interacting with Dynamicweb 10 solutions from the command line.",
-  "version": "1.1.1",
+  "version": "2.0.0-beta.0",
   "main": "bin/index.js",
   "files": [
     "bin/**"
@@ -48,4 +48,4 @@
     "node-fetch": "^3.2.10",
     "yargs": "^17.5.1"
   }
-}
+}