@dynamicweb/cli 1.0.11 → 1.0.13

package/bin/commands/files.js

@@ -286,11 +286,8 @@ export function resolveFilePath(filePath) {
     return path.join(p.dir, resolvedPath);
 }
 
+
 function wildcardToRegExp(wildcard) {
-    return new RegExp('^' + wildcard
-      .replace(/\./g, '\\.')
-      .replace(/\*/g, '.*')
-      .replace(/\+/g, '.+')
-      .replace(/\?/g, '.')
-      + '$');
+    return new RegExp('^' + wildcard.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '$');
 }
+

package/bin/commands/install.js

@@ -13,6 +13,11 @@ export function installCommand() {
             .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}`)
@@ -25,13 +30,14 @@ 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))
+    await installAddin(env, user, resolveFilePath(argv.filePath), argv.queue)
 }
 
-async function installAddin(env, user, resolvedPath) {
+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)}`
         ]

package/bin/commands/login.js

@@ -118,6 +118,7 @@ async function loginInteractive(result, verbose) {
     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();
 }
 
@@ -131,12 +132,11 @@ async function login(username, password, env, protocol, verbose) {
         headers: {
             'Content-Type': 'application/x-www-form-urlencoded'
         },
-        agent: getAgent(protocol)
+        agent: getAgent(protocol),
+        redirect: "manual"
     });
 
-    if (res.ok) {
-        console.log(res)
-        console.log(res.json())
+    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)

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.11",
+  "version": "1.0.13",
   "main": "bin/index.js",
   "files": [
     "bin/*"