@heroku/skynet 1.6.17 → 1.6.18

package/commands/deprovision.js

@@ -2,6 +2,7 @@ const cli = require('heroku-cli-util')
 const command = require('../lib/command')
 const sudo = require('../lib/sudo')
 const SkynetAPI = require('../lib/skynet')
+const notifyOption = require('../lib/notifyOption')
 
 async function run (context) {
   sudo()
@@ -10,7 +11,9 @@ async function run (context) {
   const notes = context.flags.notes
   const category = context.flags.category
   const force = context.flags.bypass
-  const notify = !context.flags['no-notify']
+
+  const notify = notifyOption.set(context.flags.notify, context.flags['no-notify'])
+  const notificationStatus = (notify) ? 'enabled' : 'disabled'
 
   if (!user) {
     throw new Error('Required flag: --user USER')
@@ -18,7 +21,7 @@ async function run (context) {
 
   let response = await cli.action(`deprovisioning ${cli.color.cyan(user)}`, skynet.deprovision(user, notes, category, notify, force))
   response = JSON.parse(response)
-  cli.log(`${response.status}. ${response.message}`)
+  cli.log(`${response.status}. ${response.message}. Notification ${notificationStatus}`)
 }
 
 module.exports = {
@@ -32,6 +35,7 @@ module.exports = {
     { name: 'category', char: 'c', description: 'suspension category', hasValue: true, required: true },
     { name: 'notes', char: 'n', description: 'suspend notes', hasValue: true, required: true },
     { name: 'bypass', description: 'bypass the whitelist', hasValue: false, required: false },
+    { name: 'notify', description: 'send user suspension email notification', hasValue: false, required: false },
     { name: 'no-notify', description: 'skip user suspension email notification', hasValue: false, required: false }
   ],
   run: command(run)

package/commands/suspend/user.js

@@ -3,6 +3,7 @@ const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
 const HerokuAPI = require('../../lib/heroku')
+const notifyOption = require('../../lib/notifyOption')
 
 function readlines (file) {
   return new Promise(function (resolve, reject) {
@@ -41,9 +42,11 @@ async function run (context) {
   const notes = context.flags.notes
   const category = context.flags.category
   const force = context.flags.bypass
-  const notify = !context.flags['no-notify']
   const unverify = context.flags.unverify
 
+  const notify = notifyOption.set(context.flags.notify, context.flags['no-notify'])
+  const notificationStatus = (notify) ? 'enabled' : 'disabled'
+
   if (user && file) {
     throw new Error('Either --user USER or --infile must be passed, but not both')
   }
@@ -51,7 +54,7 @@ async function run (context) {
   if (file) {
     const users = await readlines(file)
     const response = await skynet.bulkSuspendUsers(users.join(), notes, category, notify, force)
-    cli.log(response)
+    cli.log(`${response}. Notification ${notificationStatus}`)
 
     if (unverify) {
       users.forEach(item => unverifyUser(api, item))
@@ -63,7 +66,7 @@ async function run (context) {
 
     let response = await skynet.suspendUser(user, notes, category, notify, force)
     response = JSON.parse(response)
-    cli.log(`${response.status}. ${response.message}`)
+    cli.log(`${response.status}. ${response.message}. Notification ${notificationStatus}`)
 
     if (unverify) {
       unverifyUser(api, user)
@@ -84,6 +87,7 @@ module.exports = {
     { name: 'notes', char: 'n', description: 'suspend notes', hasValue: true, required: true },
     { name: 'bypass', description: 'bypass the whitelist', hasValue: false, required: false },
     { name: 'no-notify', description: 'skip user suspension email notification', hasValue: false, required: false },
+    { name: 'notify', description: 'send user suspension email notification', hasValue: false, required: false },
     { name: 'unverify', description: 'unverifies a user account, removes all billing info', hasValue: false, required: false }
   ],
   run: command(run)

package/lib/notifyOption.js

@@ -0,0 +1,24 @@
+'use strict'
+
+exports.set = set
+
+function set (notifyFlag, noNotifyFlag) {
+  let notify = true
+  if (process.env.SKYNET_NOTIFICATION && process.env.SKYNET_NOTIFICATION === 'false') {
+    notify = false
+  }
+
+  if (notifyFlag && noNotifyFlag) {
+    throw new Error('Flag --notify and --no-notify could not use together')
+  }
+
+  if (noNotifyFlag) {
+    notify = false
+  }
+
+  if (notifyFlag) {
+    notify = true
+  }
+
+  return notify
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",