fix: only use browser login when available (#44)

Author: jdx

package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@heroku-cli/color": "^1.1.5",
     "@oclif/errors": "^1.1.2",
-    "cli-ux": "^4.6.1",
+    "cli-ux": "^4.7.1",
     "debug": "^3.1.0",
     "fs-extra": "^6.0.1",
     "heroku-client": "^3.0.6",
@@ -19,28 +19,28 @@
     "@heroku-cli/schema": "^1.0.5",
     "@heroku-cli/tslint": "^1.1.4",
     "@oclif/command": "^1.4.33",
-    "@oclif/config": "^1.6.27",
+    "@oclif/config": "^1.6.30",
     "@oclif/tslint": "^1.1.2",
     "@types/ansi-styles": "^3.2.0",
-    "@types/chai": "^4.1.3",
+    "@types/chai": "^4.1.4",
     "@types/fs-extra": "^5.0.3",
-    "@types/mocha": "^5.2.1",
+    "@types/mocha": "^5.2.2",
     "@types/nock": "^9.1.3",
-    "@types/node": "^10.3.2",
+    "@types/node": "^10.3.3",
     "@types/opn": "^5.1.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^5.0.1",
     "@types/supports-color": "^5.3.0",
     "chai": "^4.1.2",
-    "fancy-test": "^1.1.4",
+    "fancy-test": "^1.2.0",
     "mocha": "^5.2.0",
-    "nock": "^9.3.2",
+    "nock": "^9.3.3",
     "proxyquire": "^2.0.1",
-    "sinon": "^5.1.1",
+    "sinon": "^6.0.0",
     "testdouble": "^3.8.1",
-    "ts-node": "^6.1.0",
+    "ts-node": "^6.1.1",
     "tslint": "^5.10.0",
-    "typescript": "^2.9.1"
+    "typescript": "^2.9.2"
   },
   "engines": {
     "node": ">=6.0.0"

src/login.ts

@@ -57,7 +57,8 @@ export class Login {
           // can't use browser with --expires-in
           input = 'interactive'
         } else if (this.enableBrowserLogin()) {
-          input = await ux.prompt(`heroku: Login with [${color.green('b')}]rowser, [${color.green('i')}]nteractive, or [${color.green('s')}]so (enterprise-only)`, {default: defaultMethod})
+          await ux.anykey(`heroku: Press any key to open up the browser to login or ${color.yellow('q')} to exit`)
+          input = 'browser'
         } else {
           input = defaultMethod || 'interactive'
         }
@@ -72,7 +73,7 @@ export class Login {
       switch (input) {
         case 'b':
         case 'browser':
-          auth = await this.browser()
+          auth = await this.browser(opts.browser)
           break
         case 'i':
         case 'interactive':
@@ -138,19 +139,26 @@ export class Login {
     await Promise.all(requests)
   }
 
-  private async browser(): Promise<NetrcEntry> {
+  private async browser(browser?: string): Promise<NetrcEntry> {
     const {body: urls} = await HTTP.post<{browser_url: string, cli_url: string, token: string}>(`${this.loginHost}/auth`)
     // TODO: handle browser
     const url = `${this.loginHost}${urls.browser_url}`
     debug(`opening browser to ${url}`)
-    const cp = await opn(url, {wait: false})
-    cp.on('error', ux.error)
-    const showUrl = () => ux.warn(`Cannot open browser. Go to ${color.greenBright(url)} to finish login or run ${color.cmd('heroku login --interactive')}\n`)
+    let urlDisplayed = false
+    const showUrl = () => {
+      if (!urlDisplayed) ux.warn(`Cannot open browser. Go to ${color.greenBright(url)} to finish login or run ${color.cmd('heroku login --interactive')}\n`)
+      urlDisplayed = true
+    }
+    const cp = await opn(url, {app: browser, wait: false})
+    cp.on('error', err => {
+      ux.warn(err)
+      showUrl()
+    })
     if (process.env.HEROKU_TESTING_HEADLESS_LOGIN === '1') showUrl()
     cp.on('close', code => {
       if (code !== 0) showUrl()
     })
-    ux.action.start('Waiting for login')
+    ux.action.start('heroku: Waiting for login')
     const {body: auth} = await HTTP.get<{error?: string, access_token: string}>(`${this.loginHost}${urls.cli_url}`, {
       headers: {
         authorization: `Bearer ${urls.token}`,

yarn.lock

@@ -47,9 +47,9 @@
     debug "^3.1.0"
     semver "^5.5.0"
 
-"@oclif/config@^1.6.27":
-  version "1.6.27"
-  resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.6.27.tgz#d3de1cff71301784c8e4ee3903d3f7db21a18c3f"
+"@oclif/config@^1.6.30":
+  version "1.6.30"
+  resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.6.30.tgz#ec5d60c86a5f5e4c04a02c73c43459d56140fafd"
   dependencies:
     debug "^3.1.0"
     tslib "^1.9.2"
@@ -97,9 +97,9 @@
   dependencies:
     "@types/color-name" "*"
 
-"@types/chai@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.3.tgz#b8a74352977a23b604c01aa784f5b793443fb7dc"
+"@types/chai@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.4.tgz#5ca073b330d90b4066d6ce18f60d57f2084ce8ca"
 
 "@types/color-name@*":
   version "1.1.0"
@@ -115,13 +115,9 @@
   version "4.14.109"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.109.tgz#b1c4442239730bf35cabaf493c772b18c045886d"
 
-"@types/mocha@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.0.tgz#b3c8e69f038835db1a7fdc0b3d879fc50506e29e"
-
-"@types/mocha@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.1.tgz#465450aaf5cec6f7d35523748c6cc89a5e222dc5"
+"@types/mocha@^5.2.2":
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.2.tgz#202d2b8fe1364c5b617b439b26a54f0e75eac0a7"
 
 "@types/nock@^9.1.3":
   version "9.1.3"
@@ -133,13 +129,9 @@
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.4.tgz#130598ee56e9a1210a53f557d64935571f05390d"
 
-"@types/node@^10.3.0":
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.0.tgz#078516315a84d56216b5d4fed8f75d59d3b16cac"
-
-"@types/node@^10.3.2":
-  version "10.3.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.2.tgz#3840ec6c12556fdda6e0e6d036df853101d732a4"
+"@types/node@^10.3.3":
+  version "10.3.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.3.tgz#8798d9e39af2fa604f715ee6a6b19796528e46c3"
 
 "@types/opn@^5.1.0":
   version "5.1.0"
@@ -274,9 +266,9 @@ clean-stack@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
 
-cli-ux@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-4.6.1.tgz#2cc7feb4d48932a95bffe712426eaa36ec861004"
+cli-ux@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-4.7.1.tgz#b954aa806620cc818cbdd0a75e587c54bf0a0bbe"
   dependencies:
     "@oclif/linewrap" "^1.0.0"
     "@oclif/screen" "^1.0.2"
@@ -444,17 +436,18 @@ extract-stack@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-1.0.0.tgz#b97acaf9441eea2332529624b732fc5a1c8165fa"
 
-fancy-test@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-1.1.4.tgz#1bcc7b7a526218a85ed1ff0d2e95afc4b69fab23"
+fancy-test@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-1.2.0.tgz#c5f6f81725ea42b9caec9bb18731449cfab526f3"
   dependencies:
-    "@types/chai" "^4.1.3"
+    "@types/chai" "^4.1.4"
     "@types/lodash" "^4.14.109"
-    "@types/mocha" "^5.2.0"
+    "@types/mocha" "^5.2.2"
     "@types/nock" "^9.1.3"
-    "@types/node" "^10.3.0"
+    "@types/node" "^10.3.3"
     "@types/sinon" "^5.0.1"
     lodash "^4.17.10"
+    mock-stdin "^0.3.1"
     stdout-stderr "^0.1.9"
 
 fill-keys@^1.0.2:
@@ -686,6 +679,10 @@ mocha@^5.2.0:
     mkdirp "0.5.1"
     supports-color "5.4.0"
 
+mock-stdin@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/mock-stdin/-/mock-stdin-0.3.1.tgz#c657d9642d90786435c64ca5e99bbd4d09bd7dd3"
+
 module-not-found-error@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
@@ -719,9 +716,9 @@ nise@^1.3.3:
     path-to-regexp "^1.7.0"
     text-encoding "^0.6.4"
 
-nock@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-9.3.2.tgz#f2f52a784a8a33d7496f4ab5b28c3b879091e6d6"
+nock@^9.3.3:
+  version "9.3.3"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-9.3.3.tgz#d9f4cd3c011afeadaf5ccf1b243f6e353781cda0"
   dependencies:
     chai "^4.1.2"
     debug "^3.1.0"
@@ -855,9 +852,9 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-5.1.1.tgz#19c59810ffb733ea6e76a28b94a71fc4c2f523b8"
+sinon@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-6.0.0.tgz#f26627e4830dc34279661474da2c9e784f166215"
   dependencies:
     "@sinonjs/formatio" "^2.0.0"
     diff "^3.5.0"
@@ -954,9 +951,9 @@ theredoc@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/theredoc/-/theredoc-1.0.0.tgz#bcace376af6feb1873efbdd0f91ed026570ff062"
 
-ts-node@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-6.1.0.tgz#a2c37a11fdb58e60eca887a1269b025cf4d2f8b8"
+ts-node@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-6.1.1.tgz#19607140acb06150441fcdb61be11f73f7b6657e"
   dependencies:
     arrify "^1.0.0"
     diff "^3.1.0"
@@ -1047,9 +1044,9 @@ type-detect@^4.0.0, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
 
-typescript@^2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+typescript@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
 
 universalify@^0.1.0:
   version "0.1.1"