Config now also has ticket expiration. The app now also checks for username, apptoken and usertoken in environment variables. The app also first authenticates (if necessary) using username and password, before continuously using only a ticket for all requests. A usertoken will be used preferentially if provided in config/envvar. Apptoken will be added if provided.

Author: uncleflo

README.md

@@ -31,11 +31,11 @@ Below are the prompts (see the [Notes](#notes) below for an important advisory r
 ```javascript
 {
   name: 'username',
-  message: 'QuickBase username:'
+  message: 'QuickBase username (leave blank to use the QUICKBASE_CLI_USERNAME environment variable):'
 },
 {
   name: 'password',
-  message: 'QuickBase password (Leave blank to use the QUICKBASE_CLI_PASSWORD env variable):'
+  message: 'QuickBase password (leave blank to use the QUICKBASE_CLI_PASSWORD environment variable):'
 },
 {
   name: 'dbid',
@@ -47,11 +47,19 @@ Below are the prompts (see the [Notes](#notes) below for an important advisory r
 },
 {
   name: 'appToken',
-  message: 'QuickBase application token (if applicable):'
+  message: 'QuickBase application token (if applicable) (leave blank to use the QUICKBASE_CLI_APPTOKEN environment variable):'
+},
+{
+  name: 'userToken',
+  message: 'QuickBase user token (if applicable) (leave blank to use the QUICKBASE_CLI_USERTOKEN environment variable):'
 },
 {
   name: 'appName',
   message: 'Code page prefix (leave blank to disable prefixing uploaded pages):'
+},
+{
+  name: 'ticketExpiryHours',
+  message: 'Ticket expiry period in hours (default is 1):'
 }
 ```
 
@@ -92,6 +100,8 @@ For now this is only a wrapper around `git clone`. After you pull down a repo yo
 
 * Instead of exposing your password for the `quickbase-cli.config.js` file you can rely on an environment variable called `QUICKBASE_CLI_PASSWORD`. If you have that variable defined and leave the `password` empty when prompted the `qb deploy` command will use it instead. Always practice safe passwords.
 
+* The same can also be done with username (using `QUICKBASE_CLI_USERNAME`), user token (using `QUICKBASE_CLI_USERTOKEN`) and/or app token (using `QUICKBASE_CLI_APPTOKEN`).
+
 * ~~Moves are being made to add cool shit like a build process, global defaults, awesome starter templates, and pulling down existing code files from QuickBase. They're not out yet, so for now you're on your own.~~
 
 * I no longer work with QuickBase applications, so the cool shit I had planned won't happen unless someone submits some dope pull requests.

bin/qb-deploy.js

@@ -41,37 +41,45 @@ if (program.watch) {
   });
 }
 
+
 async function qbDeploy(source) {
   console.log('Uploading files to QuickBase...');
 
   const stats = await fs.statSync(source);
   const isFile = stats.isFile();
 
-  if (isFile) {
-    return uploadToQuickbase(source)
-      .then(res =>
-        console.log(`Successfully uploaded to QuickBase:\n=> ${source}`)
-      )
-      .catch(err => console.error(err));
-  }
-
-  if (!isFile) {
-    getFiles(source).then(files => {
-      const uploadPromises = program.replace
-        ? files.map(file => replaceUrlsAndUpload(file, files))
-        : files.map(file => uploadToQuickbase(file));
-
-      return Promise.all(uploadPromises)
+  //We authenticate here, before we make a series of asynchronous api calls for each file
+  api.authenticateIfNeeded().then((authType) => {
+    
+    if (isFile) {
+      return uploadToQuickbase(source)
         .then(res =>
-          console.log(
-            `Successfully uploaded to QuickBase:\n=> ${files.join('\n=> ')}`
-          )
+          console.log(`Successfully uploaded to QuickBase:\n=> ${source}`)
         )
         .catch(err => console.error(err));
-    });
-  }
+    }
+
+    if (!isFile) {
+      getFiles(source).then(files => {
+        const uploadPromises = program.replace
+          ? files.map(file => replaceUrlsAndUpload(file, files))
+          : files.map(file => uploadToQuickbase(file));
+
+        return Promise.all(uploadPromises)
+          .then(res =>
+            console.log(
+              `Successfully uploaded to QuickBase:\n=> ${files.join('\n=> ')}`
+            )
+          )
+          .catch(err => console.error(err));
+      });
+    }
+
+  }).catch((errorDesc) => console.error(errorDesc));
+
 }
 
+
 function uploadToQuickbase(file, fileContents) {
   let fileName = path.basename(file);
   let codePageName;
@@ -89,6 +97,7 @@ function uploadToQuickbase(file, fileContents) {
   return api.uploadPage(codePageName, fileContents);
 }
 
+
 async function replaceUrlsAndUpload(file, allFiles) {
   let fileContents = await readFile(file, 'utf-8');
 
@@ -107,12 +116,13 @@ async function replaceUrlsAndUpload(file, allFiles) {
   return uploadToQuickbase(file, fileContents);
 }
 
+
 function generateCustomPageUrl(fileName) {
   const suffix = config.appName
     ? `${config.appName}-${fileName}`
     : `${fileName}`;
 
   return `"https://${config.realm}.quickbase.com/db/${
     config.dbid
-  }?a=dbpage&pagename=${suffix}"`;
+    }?a=dbpage&pagename=${suffix}"`;
 }

bin/qb-init.js

@@ -8,7 +8,7 @@ const QUESTIONS = [
   {
     type: 'input',
     name: 'username',
-    message: 'QuickBase username:'
+    message: 'QuickBase username (leave blank to use the QUICKBASE_CLI_USERNAME environment variable):'
   },
   {
     type: 'password',
@@ -29,13 +29,24 @@ const QUESTIONS = [
   {
     type: 'input',
     name: 'appToken',
-    message: 'QuickBase application token (if applicable):'
+    message: 'QuickBase application token (if applicable) (leave blank to use the QUICKBASE_CLI_APPTOKEN environment variable):'
+  },
+  {
+    type: 'input',
+    name: 'userToken',
+    message: 'QuickBase user token (if applicable) (leave blank to use the QUICKBASE_CLI_USERTOKEN environment variable):'
   },
   {
     type: 'input',
     name: 'appName',
     message:
       'Code page prefix (leave blank to disable prefixing uploaded pages):'
+  },
+  {
+    type: 'input',
+    name: 'ticketExpiryHours',
+    message:
+      'Ticket expiry period in hours (default is 1):'
   }
 ];
 

demo/index.html

@@ -7,7 +7,9 @@
   </head>
   <body>
     <h1>Hello, world</h1>
-
+    <p>This is a page, that should be deployed using quickbase-cli to quickbase, with styling and scripts properly referenced.</p>
+    <p class="check_css">If this paragraph is bold, CSS files are properly referenced.</p>
+    <p class="check_js">If this paragraph is bold, JS files are properly referenced.</p>
     <script src="static/bundle.js"></script>
   </body>
 </html>

demo/static/bundle.js

@@ -1 +1,4 @@
 console.log('Hello from bundle.js');
+var elements = document.getElementsByClassName('check_js');
+var checkJsElement = elements[0];
+checkJsElement.style.fontWeight = 'bold';

demo/static/main.css

@@ -1,3 +1,7 @@
 body {
   font-family: sans-serif;
 }
+
+.check_css {
+	font-weight: bold;
+}