@heroku/skynet 1.6.2 → 1.6.4

package/README.md

@@ -16,7 +16,7 @@ heroku plugins:install heroku-skynet-cli
 ### Manual testing
 
 1. Make sure your staging account is setup: https://github.com/heroku/engineering-docs/blob/master/guides/staging-account-setup.md
-1. Get someone to add you to the `heroku-security` team/org in staging.
+1. Get someone to add you to the `heroku-security` team/org in [staging](https://dashboard-api-staging.herokuapp.com/teams/heroku-security/access)
 1. Make sure you have the latest ion-client installed:
 
     ```

package/commands/categories/add.js

@@ -0,0 +1,21 @@
+let cli = require('heroku-cli-util')
+let command = require('../../lib/command')
+let SkynetAPI = require('../../lib/skynet')
+
+async function run (context) {
+  const skynet = new SkynetAPI(context.auth.password)
+  await cli.action(`adding new category: ${cli.color.cyan(context.flags.category)}`, skynet.addCategory(context.flags.category, context.flags.description))
+}
+
+module.exports = {
+  topic: 'skynet',
+  command: 'categories:add',
+  description: 'adds a value to suspension categories',
+  help: `Examples:
+    $ heroku sudo skynet:categories:add -c new-category -d "this is a new category"`,
+  flags: [
+    { name: 'category', char: 'c', description: 'new category value', hasValue: true, required: true },
+    { name: 'description', char: 'd', description: 'new category description', hasValue: true, required: true }
+  ],
+  run: command(run)
+}

package/commands/categories/remove.js

@@ -0,0 +1,20 @@
+let cli = require('heroku-cli-util')
+let command = require('../../lib/command')
+let SkynetAPI = require('../../lib/skynet')
+
+async function run (context) {
+  const skynet = new SkynetAPI(context.auth.password)
+  await cli.action(`removing ${cli.color.cyan(context.flags.category)} from suspension categories`, skynet.removeCategory(context.flags.category))
+}
+
+module.exports = {
+  topic: 'skynet',
+  command: 'categories:remove',
+  description: 'removes a value from suspension categories',
+  help: `Examples:
+    $ heroku sudo skynet:categories:remove -c test-category`,
+  flags: [
+    { name: 'category', char: 'c', description: 'category to remove', hasValue: true, required: true }
+  ],
+  run: command(run)
+}

package/commands/suspend/app-owner.js

@@ -41,13 +41,14 @@ async function run (context) {
 
   if (file) {
     let apps = await readlines(file)
-    await cli.action(`bulk app-owner suspension for ${cli.color.cyan(apps.length)} apps.`, skynet.bulkSuspendAppOwner(apps.join(), notes, category))
+    let response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category)
+    cli.log(response)
   } else {
     if (!app) {
       throw new Error('Required flag: --owner OWNER or --infile FILE')
     }
 
-    let response = await cli.action(`suspending the owner of ${cli.color.cyan(app)}`, skynet.suspendAppOwner(app, notes, category, force))
+    let response = await skynet.suspendAppOwner(app, notes, category, force)
     response = JSON.parse(response)
     cli.log(`${response.status}. ${response.message}`)
   }

package/commands/suspend/user.js

@@ -42,13 +42,14 @@ async function run (context) {
 
   if (file) {
     let users = await readlines(file)
-    await cli.action(`bulk user suspension for ${cli.color.cyan(users.length)} users.`, skynet.bulkSuspendUsers(users.join(), notes, category))
+    let response = await skynet.bulkSuspendUsers(users.join(), notes, category)
+    cli.log(response)
   } else {
     if (!user) {
       throw new Error('Required flag: --user USER or --infile FILE')
     }
 
-    let response = await cli.action(`suspending ${cli.color.cyan(user)}`, skynet.suspendUser(user, notes, category, notify, force))
+    let response = await skynet.suspendUser(user, notes, category, notify, force)
     response = JSON.parse(response)
     cli.log(`${response.status}. ${response.message}`)
   }

package/index.js

@@ -14,6 +14,8 @@ exports.commands = [
   require('./commands/unsuspend/user.js'),
   require('./commands/deprovision.js'),
   require('./commands/categories.js'),
+  require('./commands/categories/add.js'),
+  require('./commands/categories/remove.js'),
   require('./commands/whitelist/add.js'),
   require('./commands/whitelist/remove.js')
 ]

package/lib/skynet.js

@@ -21,12 +21,10 @@ module.exports = class SkynetAPI {
       'User-Agent': this.version
     })
 
-    if (['POST', 'PATCH', 'DELETE'].includes(options.method)) {
-      options.headers['Content-type'] = 'application/x-www-form-urlencoded'
+    if (options.form) {
+      options.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     }
 
-    options.json = false
-
     return cli.got(SKYNET_BASE_URL + url, options).then(res => res.body)
   }
 
@@ -44,7 +42,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/whitelist`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -62,7 +61,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/userpass/remove`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -74,7 +74,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/userpass/add`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -89,7 +90,8 @@ module.exports = class SkynetAPI {
 
     return this.request('/suspend/app-owner', {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -104,7 +106,8 @@ module.exports = class SkynetAPI {
 
     return this.request('/suspend/app', {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -126,7 +129,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/user`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -147,7 +151,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/user`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -162,7 +167,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/app-owner`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -177,7 +183,8 @@ module.exports = class SkynetAPI {
 
     return this.request(`/deprovision`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
     })
   }
 
@@ -192,7 +199,27 @@ module.exports = class SkynetAPI {
 
     return this.request(`/deprovision`, {
       method: 'POST',
-      body: qs.stringify(body)
+      body: qs.stringify(body),
+      form: true
+    })
+  }
+
+  addCategory (category, description) {
+    let body = {
+      category: category,
+      description: description
+    }
+
+    return this.request(`/categories`, {
+      method: 'POST',
+      body: JSON.stringify(body),
+      json: true
+    })
+  }
+
+  removeCategory (category) {
+    return this.request(`/categories/${category}`, {
+      method: 'DELETE'
     })
   }
 }

package/package.json

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