heroku-cli-util
Advanced tools
Comparing version 6.1.6 to 6.1.7
@@ -36,2 +36,3 @@ 'use strict' | ||
exports.exit = require('./lib/exit').exit | ||
exports.login = require('./lib/login') | ||
exports.auth = require('./lib/auth') | ||
exports.login = exports.auth.login |
'use strict' | ||
let Heroku = require('heroku-client') | ||
let cli = require('..') | ||
const Heroku = require('heroku-client') | ||
const cli = require('..') | ||
const auth = require('./auth') | ||
@@ -48,24 +49,2 @@ function apiMiddleware (response, cb) { | ||
function login () { | ||
const spawn = require('child_process').spawn | ||
return new Promise(function (resolve, reject) { | ||
spawn('heroku', ['login'], {stdio: 'inherit'}) | ||
.on('close', function (e) { | ||
if (e === 0) resolve() | ||
else reject(new Error('Authorization failed.')) | ||
}) | ||
}) | ||
} | ||
function getNewAPIKey () { | ||
const exec = require('child_process').exec | ||
return new Promise(function (resolve, reject) { | ||
exec('heroku auth:token', function (error, stdout, stderr) { | ||
if (stderr) console.error(stderr) | ||
if (error) reject(error) | ||
resolve(stdout.trim()) | ||
}) | ||
}) | ||
} | ||
function relogin () { | ||
@@ -77,3 +56,3 @@ if (process.env.HEROKU_API_KEY) { | ||
} | ||
return login().then(getNewAPIKey) | ||
return auth.login({save: true}) | ||
} | ||
@@ -111,2 +90,3 @@ | ||
let run = function () { | ||
context.auth = {password: auth.token()} | ||
let p = fn(context, heroku(context)) | ||
@@ -117,6 +97,3 @@ if (!p.catch) return | ||
cli.error(err.body.message || 'Unauthorized') | ||
relogin() | ||
.then(apiKey => { context.auth = {password: apiKey} }) | ||
.then(run) | ||
.catch(handleErr) | ||
relogin().then(run).catch(handleErr) | ||
} else if (err && err.body && err.body.id === 'sudo_reason_required') { | ||
@@ -123,0 +100,0 @@ cli.warn(err.body.message) |
{ | ||
"name": "heroku-cli-util", | ||
"description": "Set of helpful CLI utilities", | ||
"version": "6.1.6", | ||
"version": "6.1.7", | ||
"author": "Jeff Dickey (@dickeyxxx)", | ||
@@ -28,2 +28,3 @@ "bugs": { | ||
"lodash.result": "4.5.2", | ||
"netrc-parser": "2.0.0", | ||
"opn": "^3.0.3", | ||
@@ -30,0 +31,0 @@ "supports-color": "^3.1.2", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Network access
Supply chain riskThis module accesses the network.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2685
78624
22
24
35
+ Addednetrc-parser@2.0.0
+ Addedbabel-runtime@6.26.0(transitive)
+ Addedcore-js@2.6.12(transitive)
+ Addedlex@1.7.9(transitive)
+ Addednetrc-parser@2.0.0(transitive)
+ Addedregenerator-runtime@0.11.1(transitive)