@heroku/skynet 1.6.3 → 1.6.5

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/lib/command.js

@@ -4,10 +4,9 @@ module.exports = fn =>
   cli.command((context, client) =>
     fn(context, client).catch(err => {
       if (err.body) {
-        console.log(JSON.stringify(err.body))
+        throw JSON.stringify(err.body)
       } else {
-        console.log(err)
+        throw err
       }
-      throw err
     })
   )

package/lib/skynet.js

@@ -1,5 +1,4 @@
-const cli = require('heroku-cli-util')
-const qs = require('querystring')
+const got = require('got')
 let skynetHost = 'https://skynet.herokai.com'
 
 if (process.env.SKYNET_HOST) {
@@ -21,11 +20,7 @@ module.exports = class SkynetAPI {
       'User-Agent': this.version
     })
 
-    if (options.form) {
-      options.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-    }
-
-    return cli.got(SKYNET_BASE_URL + url, options).then(res => res.body)
+    return got(SKYNET_BASE_URL + url, options).then(res => res.body)
   }
 
   categories () {
@@ -42,7 +37,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/whitelist`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -61,7 +56,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/userpass/remove`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -74,7 +69,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/userpass/add`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -90,7 +85,7 @@ module.exports = class SkynetAPI {
 
     return this.request('/suspend/app-owner', {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -106,7 +101,7 @@ module.exports = class SkynetAPI {
 
     return this.request('/suspend/app', {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -129,7 +124,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/user`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -151,7 +146,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/user`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -167,7 +162,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/suspend/app-owner`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -183,7 +178,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/deprovision`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -199,7 +194,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/deprovision`, {
       method: 'POST',
-      body: qs.stringify(body),
+      body: body,
       form: true
     })
   }
@@ -212,7 +207,7 @@ module.exports = class SkynetAPI {
 
     return this.request(`/categories`, {
       method: 'POST',
-      body: JSON.stringify(body),
+      body: body,
       json: true
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",
@@ -17,11 +17,12 @@
     "/commands"
   ],
   "dependencies": {
+    "got": "^9.6.0",
     "heroku-cli-util": "~6.2.12",
     "split": "^1.0.0"
   },
   "devDependencies": {
-    "mocha": "^3.4.2",
+    "mocha": "^5.2.0",
     "mockdate": "^2.0.1",
     "nock": "~9.0.13",
     "np": "^3.1.0",