fix: remove account selector logic for credential manager (#350)

Author: k80bowman

src/credential-manager-core/index.ts

@@ -6,7 +6,6 @@ import {LinuxHandler} from './credential-handlers/linux-handler.js'
 import {MacOSHandler} from './credential-handlers/macos-handler.js'
 import {NetrcHandler} from './credential-handlers/netrc-handler.js'
 import {WindowsHandler} from './credential-handlers/windows-handler.js'
-import {selectAccount} from './lib/account-selector.js'
 import {reportCredentialStoreError} from './lib/cli-command-telemetry.js'
 import {CredentialStore, getNativeCredentialStore, getStorageConfig} from './lib/credential-storage-selector.js'
 import {AuthEntry, NetrcAuthEntry} from './lib/types.js'
@@ -72,24 +71,11 @@ export async function getAuth(account: string | undefined, host: string, service
   const config = getStorageConfig()
   const netrcHandler = new NetrcHandler()
 
-  if (config.credentialStore) {
+  if (config.credentialStore && account) {
     try {
       const handler = getCredentialHandler(config.credentialStore)
-
-      if (account) {
-        const token = handler.getAuth(account, service)
-        return {account, token}
-      }
-
-      const accounts = handler.listAccounts(service)
-      const selectedAccount = await selectAccount(accounts)
-
-      if (selectedAccount) {
-        const token = handler.getAuth(selectedAccount, service)
-        return {account: selectedAccount, token}
-      }
-
-      throw new Error('No auth found')
+      const token = handler.getAuth(account, service)
+      return {account, token}
     } catch (error) {
       const {message} = error as Error
       credDebug(message)
@@ -186,7 +172,6 @@ export {LinuxHandler} from './credential-handlers/linux-handler.js'
 export {MacOSHandler} from './credential-handlers/macos-handler.js'
 export {NetrcHandler} from './credential-handlers/netrc-handler.js'
 export {WindowsHandler} from './credential-handlers/windows-handler.js'
-export {selectAccount} from './lib/account-selector.js'
 export {CredentialStore, getNativeCredentialStore, getStorageConfig} from './lib/credential-storage-selector.js'
 export type {StorageConfig} from './lib/credential-storage-selector.js'
 export {deleteLoginState, readLoginState, writeLoginState} from './lib/login-state.js'

src/credential-manager-core/lib/account-selector.ts

@@ -160,13 +160,6 @@ describe('credential-manager acceptance', function () {
       expect(accounts).to.include(accountB)
       expect(accounts).to.not.include(CREDENTIAL_ALTERNATE_SERVICE.account)
     })
-
-    it('retrieves when account is not provided and only one account is found', async function () {
-      await saveAuth(CREDENTIAL.account, CREDENTIAL.token, [], CREDENTIAL.service)
-
-      const auth = await getAuth(undefined, 'missing.host.example.com', CREDENTIAL.service)
-      expect(auth).to.deep.equal({account: CREDENTIAL.account, token: CREDENTIAL.token})
-    })
   })
 
   describe('native credential store + netrc fallback', function () {

test/credential-manager/acceptance/index.acceptance.test.ts

@@ -1,6 +1,5 @@
 import {expect, use} from 'chai'
 import chaiAsPromised from 'chai-as-promised'
-import inquirer from 'inquirer'
 import sinon from 'sinon'
 import {stderr} from 'stdout-stderr'
 
@@ -244,57 +243,7 @@ describe('credential-manager', function () {
       stderr.stop()
     })
 
-    it('should use the selected account when an account is not provided', async function () {
-      const listAccountsStub = sinon.stub(MacOSHandler.prototype, 'listAccounts').returns(['user@example.com'])
-      const getAuthStub = sinon.stub(MacOSHandler.prototype, 'getAuth').returns('keychain-token')
-      const netrcStub = sinon.stub(NetrcHandler.prototype, 'getAuth')
-
-      const auth = await credentialManager.getAuth(undefined, 'api.heroku.com')
-
-      expect(listAccountsStub.calledOnce).to.be.true
-      expect(listAccountsStub.firstCall.args[0]).to.equal('heroku-cli')
-      expect(getAuthStub.calledOnce).to.be.true
-      expect(netrcStub.notCalled).to.be.true
-      expect(auth).to.deep.equal({account: 'user@example.com', token: 'keychain-token'})
-    })
-
-    it('should use the selected account when an account is not provided and multiple accounts are found', async function () {
-      const listAccountsStub = sinon.stub(MacOSHandler.prototype, 'listAccounts').returns(['user1@example.com', 'user2@example.com'])
-      const promptStub = (sinon.stub(inquirer, 'prompt')).resolves({account: 'user2@example.com'})
-      const macosStub = sinon.stub(MacOSHandler.prototype, 'getAuth').returns('keychain-token')
-      const netrcStub = sinon.stub(NetrcHandler.prototype, 'getAuth')
-
-      const auth = await credentialManager.getAuth(undefined, 'api.heroku.com')
-
-      expect(listAccountsStub.calledOnce).to.be.true
-      expect(promptStub.calledOnce).to.be.true
-      expect(macosStub.calledOnce).to.be.true
-      expect(netrcStub.notCalled).to.be.true
-      expect(auth).to.deep.equal({account: 'user2@example.com', token: 'keychain-token'})
-    })
-
-    it('should fall back to netrc when an account is not provided and no accounts are found', async function () {
-      sinon.stub(MacOSHandler.prototype, 'listAccounts').returns([])
-      const macosStub = sinon.stub(MacOSHandler.prototype, 'getAuth')
-      const netrcStub = sinon.stub(NetrcHandler.prototype, 'getAuth')
-      netrcStub.resolves({login: 'user@example.com', password: 'netrc-token'})
-
-      stderr.start()
-
-      const auth = await credentialManager.getAuth(undefined, 'api.heroku.com')
-
-      expect(macosStub.notCalled).to.be.true
-      expect(netrcStub.calledOnce).to.be.true
-      expect(auth).to.deep.equal({account: 'user@example.com', token: 'netrc-token'})
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t retrieve the Heroku token from heroku-cli.')
-      expect(unwrap(stderr.output)).to.contain('We\'ll try to retrieve the token from the .netrc file instead.')
-      expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
-
-      stderr.stop()
-    })
-
-    it('should fall back to netrc when an account is not provided and listAccounts fails', async function () {
-      sinon.stub(MacOSHandler.prototype, 'listAccounts').throws(new Error('Keychain error'))
+    it('should fall back to netrc when an account is not provided', async function () {
       const macosStub = sinon.stub(MacOSHandler.prototype, 'getAuth')
       const netrcStub = sinon.stub(NetrcHandler.prototype, 'getAuth')
       netrcStub.resolves({login: 'user@example.com', password: 'netrc-token'})
@@ -306,9 +255,6 @@ describe('credential-manager', function () {
       expect(macosStub.notCalled).to.be.true
       expect(netrcStub.calledOnce).to.be.true
       expect(auth).to.deep.equal({account: 'user@example.com', token: 'netrc-token'})
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t retrieve the Heroku token from heroku-cli.')
-      expect(unwrap(stderr.output)).to.contain('We\'ll try to retrieve the token from the .netrc file instead.')
-      expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
       stderr.stop()
     })