@heroku/skynet 1.6.6 → 1.6.8

package/commands/deprovision.js

@@ -3,54 +3,21 @@ let command = require('../lib/command')
 let sudo = require('../lib/sudo')
 let SkynetAPI = require('../lib/skynet')
 
-function readlines (file) {
-  return new Promise(function (resolve, reject) {
-    let split = require('split')
-    let fs = require('fs')
-
-    let users = []
-
-    fs.createReadStream(file).pipe(split())
-      .on('data', function (line) {
-        line = line.trim()
-        if (line) {
-          users.push(line)
-        }
-      })
-      .on('end', function () {
-        resolve(users)
-      })
-      .on('error', function (err) {
-        reject(err)
-      })
-  })
-}
-
 async function run (context) {
   sudo()
   const skynet = new SkynetAPI(context.auth.password)
   let user = context.flags.user || process.env.HEROKU_USER
-  let file = context.flags.infile
   let notes = context.flags.notes
   let category = context.flags.category
   let force = context.flags.bypass
 
-  if (user && file) {
-    throw new Error('Either --user USER or --infile must be passed, but not both')
+  if (!user) {
+    throw new Error('Required flag: --user USER')
   }
 
-  if (file) {
-    let users = await readlines(file)
-    await cli.action(`bulk deprovisioning for ${cli.color.cyan(users.length)} users`, skynet.bulkDeprovision(users.join(), notes, category))
-  } else {
-    if (!user) {
-      throw new Error('Required flag: --user USER or --infile FILE')
-    }
-
-    let response = await cli.action(`deprovisioning ${cli.color.cyan(user)}`, skynet.deprovision(user, notes, category, force))
-    response = JSON.parse(response)
-    cli.log(`${response.status}. ${response.message}`)
-  }
+  let response = await cli.action(`deprovisioning ${cli.color.cyan(user)}`, skynet.deprovision(user, notes, category, force))
+  response = JSON.parse(response)
+  cli.log(`${response.status}. ${response.message}`)
 }
 
 module.exports = {
@@ -61,7 +28,6 @@ module.exports = {
     $ heroku skynet:deprovision -u foo@bar.com -n "helpful suspend message" -c "spam"`,
   flags: [
     { name: 'user', char: 'u', description: 'user to deprovision', hasValue: true },
-    { name: 'infile', char: 'i', description: 'file list of users to deprovision', hasValue: true },
     { 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 }

package/commands/suspend/user.js

@@ -42,7 +42,7 @@ async function run (context) {
 
   if (file) {
     let users = await readlines(file)
-    let response = await skynet.bulkSuspendUsers(users.join(), notes, category)
+    let response = await skynet.bulkSuspendUsers(users.join(), notes, category, notify, force)
     cli.log(response)
   } else {
     if (!user) {

package/commands/userpass/add.js

@@ -4,7 +4,7 @@ let SkynetAPI = require('../../lib/skynet')
 
 async function run (context) {
   const skynet = new SkynetAPI(context.auth.password)
-  await cli.action(`adding ${cli.color.cyan(context.flags.userpass)} to ${cli.color.cyan(context.flags.user)}`, skynet.addUserpass(context.flags.user, context.flags.flag))
+  await cli.action(`adding ${cli.color.cyan(context.flags.flag)} to ${cli.color.cyan(context.flags.user)}`, skynet.addUserpass(context.flags.user, context.flags.flag))
 }
 
 module.exports = {

package/lib/skynet.js

@@ -135,13 +135,15 @@ module.exports = class SkynetAPI {
     })
   }
 
-  bulkSuspendUsers (users, notes, category) {
+  bulkSuspendUsers (users, notes, category, notify, force = false) {
     var body = {
       value: users,
       reason: notes,
       method: 'skynet-cli',
       category: category,
-      bulk: 'true'
+      bulk: 'true',
+      force: force,
+      notify: notify
     }
 
     return this.request(`/suspend/user`, {
@@ -183,22 +185,6 @@ module.exports = class SkynetAPI {
     })
   }
 
-  bulkDeprovision (users, notes, category) {
-    var body = {
-      value: users,
-      reason: notes,
-      method: 'skynet-cli',
-      category: category,
-      bulk: 'true'
-    }
-
-    return this.request(`/deprovision`, {
-      method: 'POST',
-      body: body,
-      form: true
-    })
-  }
-
   addCategory (category, description) {
     let body = {
       category: category,

package/package.json

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