fix: use settings file for login insted of netrc

to avoid wget warnings

Author: jdx

package.json

@@ -9,6 +9,7 @@
     "@oclif/errors": "^1.1.2",
     "cli-ux": "^4.4.0",
     "debug": "^3.1.0",
+    "fs-extra": "^6.0.1",
     "heroku-client": "^3.0.6",
     "http-call": "^5.1.4",
     "netrc-parser": "^3.1.5",
@@ -22,6 +23,7 @@
     "@oclif/tslint": "^1.1.2",
     "@types/ansi-styles": "^3.2.0",
     "@types/chai": "^4.1.3",
+    "@types/fs-extra": "^5.0.2",
     "@types/mocha": "^5.2.0",
     "@types/nock": "^9.1.3",
     "@types/node": "^10.1.2",

src/login.ts

@@ -2,10 +2,12 @@ import color from '@heroku-cli/color'
 import * as Heroku from '@heroku-cli/schema'
 import * as Config from '@oclif/config'
 import ux from 'cli-ux'
+import * as fs from 'fs-extra'
 import HTTP from 'http-call'
 import Netrc from 'netrc-parser'
 import opn = require('opn')
 import {hostname} from 'os'
+import * as path from 'path'
 
 import {APIClient, HerokuAPIError} from './api_client'
 import {vars} from './vars'
@@ -23,19 +25,21 @@ export namespace Login {
 interface NetrcEntry {
   login: string
   password: string
-  method?: 'interactive' | 'sso' | 'browser'
-  org?: string
-  refresh?: string
 }
 
 const headers = (token: string) => ({headers: {accept: 'application/vnd.heroku+json; version=3', authorization: `Bearer ${token}`}})
 
 export class Login {
   loginHost = process.env.HEROKU_LOGIN_HOST || 'https://cli-login.heroku.com'
+  settings!: {
+    method?: string
+    org?: string
+  }
 
   constructor(private readonly config: Config.IConfig, private readonly heroku: APIClient) {}
 
   async login(opts: Login.Options = {}): Promise<void> {
+    await this.loadSettings()
     let loggedIn = false
     try {
       // timeout after 10 minutes
@@ -47,7 +51,7 @@ export class Login {
       await Netrc.load()
       const previousEntry = Netrc.machines['api.heroku.com']
       let input: string | undefined = opts.method
-      const defaultMethod = (previousEntry && previousEntry.method) || 'interactive'
+      const defaultMethod = this.settings.method || 'interactive'
       if (!input) {
         if (opts.expiresIn) {
           // can't use browser with --expires-in
@@ -64,6 +68,7 @@ export class Login {
         ux.warn(err)
       }
       let auth
+      delete this.settings.method
       switch (input) {
         case 'b':
         case 'browser':
@@ -75,12 +80,13 @@ export class Login {
           break
         case 's':
         case 'sso':
-          auth = await this.sso(previousEntry && previousEntry.org)
+          auth = await this.sso()
           break
         default:
           return this.login(opts)
       }
       await this.saveToken(auth)
+      await this.saveSettings()
     } catch (err) {
       throw new HerokuAPIError(err)
     } finally {
@@ -158,7 +164,6 @@ export class Login {
     return {
       login: account.email!,
       password: auth.access_token,
-      method: 'browser',
     }
   }
 
@@ -176,7 +181,6 @@ export class Login {
       auth = await this.createOAuthToken(login!, password, {expiresIn, secondFactor})
     }
     this.heroku.auth = auth.password
-    auth.method = 'interactive'
     return auth
   }
 
@@ -212,9 +216,6 @@ export class Login {
       Netrc.machines[host].login = entry.login
       Netrc.machines[host].password = entry.password
     })
-    Netrc.machines[vars.apiHost].refresh = entry.refresh
-    Netrc.machines[vars.apiHost].method = entry.method
-    Netrc.machines[vars.apiHost].org = entry.org
     if (Netrc.machines._tokens) {
       (Netrc.machines._tokens as any).forEach((token: any) => {
         if (hosts.includes(token.host)) {
@@ -243,10 +244,10 @@ export class Login {
     return this.config.channel !== 'stable'
   }
 
-  private async sso(org?: string): Promise<NetrcEntry> {
+  private async sso(): Promise<NetrcEntry> {
     let url = process.env.SSO_URL
+    let org = process.env.HEROKU_ORGANIZATION || this.settings.org
     if (!url) {
-      org = process.env.HEROKU_ORGANIZATION || org
       if (org) {
         org = await ux.prompt('Organization name', {default: org})
       } else {
@@ -265,6 +266,32 @@ export class Login {
     this.heroku.auth = password
     const {body: account} = await HTTP.get<Heroku.Account>(`${vars.apiUrl}/account`, headers(password))
 
-    return {password, login: account.email!, method: 'sso', org}
+    this.settings.method = 'sso'
+    this.settings.org = org
+    return {password, login: account.email!}
+  }
+
+  private async loadSettings() {
+    try {
+      this.settings = await fs.readJSON(this.settingsPath)
+    } catch (err) {
+      if (err.code !== 'ENOENT') ux.warn(err)
+      else debug(err)
+      this.settings = {}
+    }
+  }
+
+  private async saveSettings() {
+    try {
+      if (Object.keys(this.settings).length === 0) {
+        await fs.remove(this.settingsPath)
+      } else {
+        await fs.outputJSON(this.settingsPath, this.settings)
+      }
+    } catch (err) {
+      ux.warn(err)
+    }
   }
+
+  private get settingsPath() { return path.join(this.config.dataDir, 'login.json') }
 }

yarn.lock

@@ -114,6 +114,12 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.0.tgz#926f76f7e66f49cc59ad880bb15b030abbf0b66d"
 
+"@types/fs-extra@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.2.tgz#235a7e2b56452cc0a6a4809b53e1d1eaffff9c96"
+  dependencies:
+    "@types/node" "*"
+
 "@types/mocha@^5.2.0":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.0.tgz#b3c8e69f038835db1a7fdc0b3d879fc50506e29e"