refactor: use Alias.getKeysByValue, handle multiple matches

Author: mshanemc

src/shared/orgListUtil.ts

@@ -132,7 +132,6 @@ export class OrgListUtil {
 
     for (const authInfo of authInfos) {
       const currentValue = OrgListUtil.removeRestrictedInfoFromConfig(authInfo.getFields()) as ExtendedAuthFields;
-
       const [alias, lastUsed] = await Promise.all([
         getAliasByUsername(currentValue.username),
         fs.stat(join(Global.DIR, `${currentValue.username}.json`)),

src/shared/utils.ts

@@ -8,13 +8,8 @@ import { Aliases } from '@salesforce/core';
 
 export const getAliasByUsername = async (username: string): Promise<string> => {
   const alias = await Aliases.create(Aliases.getDefaultOptions());
-  const aliasContent = alias.getContents().orgs;
-  if (aliasContent) {
-    for (const aliasedName of Object.keys(aliasContent)) {
-      if (aliasContent[aliasedName] === username) return aliasedName;
-    }
-  }
-  return undefined;
+  const keys = alias.getKeysByValue(username);
+  return keys?.length ? keys[0] : undefined;
 };
 
 export const camelCaseToTitleCase = (text: string): string => {

test/shared/utils.test.ts

@@ -13,21 +13,24 @@ describe('getAliasByUsername', () => {
   beforeEach(async () => {
     stubMethod($$.SANDBOX, Aliases, 'create').resolves(Aliases.prototype);
     stubMethod($$.SANDBOX, Aliases, 'getDefaultOptions').returns({});
-    stubMethod($$.SANDBOX, Aliases.prototype, 'getContents').returns({
-      orgs: {
-        alias1: 'username1',
-        alias2: 'username2',
-      },
-    });
+    stubMethod($$.SANDBOX, Aliases.prototype, 'getKeysByValue')
+      .withArgs('username1')
+      .returns(['alias1'])
+      .withArgs('username2')
+      .returns(['alias2', 'alias2b']);
   });
   afterEach(() => {
     $$.SANDBOX.restore();
   });
 
   it('returns alias for a username that exists', async () => {
     expect(await getAliasByUsername('username1')).to.equal('alias1');
+  });
+
+  it('returns first alias for a username that has multiple aliases', async () => {
     expect(await getAliasByUsername('username2')).to.equal('alias2');
   });
+
   it('returns undefined when no matching username is found', async () => {
     expect(await getAliasByUsername('username3')).to.be.undefined;
   });