BREAKING CHANGE(cli): Port Logout Command

packages/cli/src/commands/index.js

@@ -12,7 +12,6 @@ module.exports = {
   invite: require('./invite'),
   link: require('./link'),
   login: require('./login'),
-  logout: require('./logout'),
   logs: require('./logs'),
   migrate: require('./migrate'),
   promote: require('./promote'),

packages/cli/src/oclif/README.md

@@ -4,8 +4,8 @@ Some notes to help an ongoing project
 
 ## helpful links
 
-* the docs are fairly useful: https://oclif.io/docs/commands
-* base command source is great for seeing what's available: https://github.com/oclif/command/blob/master/src/command.ts
+- the docs are fairly useful: https://oclif.io/docs/commands
+- base command source is great for seeing what's available: https://github.com/oclif/command/blob/master/src/command.ts
 
 ## migrating a command
 
@@ -18,32 +18,32 @@ Some notes to help an ongoing project
 
 ### easy
 
-* [ ] apps
-* [ ] delete
-* [ ] describe
-* [ ] deprecate
-* [ ] help
-* [ ] history
-* [ ] invitees
-* [ ] link
-* [ ] login
-* [ ] logout
-* [ ] logs
-* [ ] migrate
-* [ ] migrate
-* [ ] register
-* [ ] test
+- [ ] apps
+- [ ] delete
+- [ ] describe
+- [ ] deprecate
+- [ ] help
+- [ ] history
+- [ ] invitees
+- [ ] link
+- [ ] login
+- [x] logout
+- [ ] logs
+- [ ] migrate
+- [ ] migrate
+- [ ] register
+- [ ] test
 
 ## hard
 
-* [ ] build
-* [ ] collaborate
-* [ ] convert
-* [ ] env
-* [ ] invite
-* [ ] promote
-* [ ] push
-* [ ] scaffold
-* [ ] upload
-* [ ] watch - remove?
-* [ ] validate
+- [ ] build
+- [ ] collaborate
+- [ ] convert
+- [ ] env
+- [ ] invite
+- [ ] promote
+- [ ] push
+- [ ] scaffold
+- [ ] upload
+- [ ] watch - remove?
+- [ ] validate

packages/cli/src/oclif/commands/logout.js

@@ -0,0 +1,36 @@
+const BaseCommand = require('../ZapierBaseCommand');
+const { buildFlags } = require('../buildFlags');
+
+const { callAPI } = require('../../utils/api');
+const { deleteFile } = require('../../utils/files');
+const { AUTH_LOCATION, AUTH_LOCATION_RAW } = require('../../constants');
+
+class LogoutCommand extends BaseCommand {
+  async perform() {
+    this.log(
+      'Preparing to deactivate local deploy key and reset local configs.'
+    );
+    this.startSpinner('Deactivating local deploy key');
+    try {
+      await callAPI('/keys', { method: 'DELETE', body: { single: true } });
+    } catch (e) {
+      this.warn(
+        'Deletion API request failed. If this is unexpected, rerun this command with `--debug` for more info.'
+      );
+    }
+    this.stopSpinner();
+
+    this.startSpinner(`Destroying \`${AUTH_LOCATION_RAW}\``);
+    const success = deleteFile(AUTH_LOCATION);
+    this.debug(`file deletion success?: ${success}`);
+    this.stopSpinner();
+
+    this.log('The active deploy key was deactivated');
+  }
+}
+
+LogoutCommand.flags = buildFlags({ opts: { format: true } });
+LogoutCommand.examples = ['zapier logout'];
+LogoutCommand.description = `Deactivates your acive deploy key and resets \`${AUTH_LOCATION_RAW}\`.`;
+
+module.exports = LogoutCommand;

packages/cli/src/oclif/oCommands.js

@@ -2,5 +2,6 @@
 
 module.exports = {
   init: require('./commands/init'),
+  logout: require('./commands/logout'),
   versions: require('./commands/versions')
 };

packages/cli/src/utils/api.js

@@ -95,10 +95,15 @@ const callAPI = (route, options, rawError = false) => {
       debug(`>> ${requestOptions.method} ${requestOptions.url}`);
       if (requestOptions.body) {
         const replacementStr = 'raw zip removed in logs';
-        const cleanedBody = _.assign({}, JSON.parse(requestOptions.body), {
-          zip_file: replacementStr,
-          source_zip_file: replacementStr
-        });
+        const requestBody = JSON.parse(requestOptions.body);
+        const cleanedBody = {};
+        for (const k in requestBody) {
+          if (k.includes('zip_file')) {
+            cleanedBody[k] = replacementStr;
+          } else {
+            cleanedBody[k] = requestBody[k];
+          }
+        }
         debug(`>> ${JSON.stringify(cleanedBody)}`);
       }
       debug(`<< ${res.status}`);

packages/cli/src/utils/files.js

@@ -45,16 +45,14 @@ const writeFile = (fileName, data) => {
   return fse.writeFile(fixHome(fileName), data);
 };
 
-// Returns a promise that deletes the file.
-const deleteFile = fileName => {
-  return new Promise(resolve => {
-    try {
-      fse.unlinkSync(fileName);
-    } catch (err) {
-      resolve();
-    }
-    resolve();
-  });
+// deletes a file, eats the error
+const deleteFile = path => {
+  try {
+    fse.unlinkSync(path);
+    return true;
+  } catch (err) {
+    return false;
+  }
 };
 
 // Returns a promise that ensures a directory exists.