Fix updateConfigWithPersonalAccessKey again

Author: camden11

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

config/__tests__/config.test.ts

@@ -314,12 +314,6 @@ describe('config/index', () => {
 
       expect(getConfigAccountEnvironment(123)).toEqual('qa');
     });
-
-    it('returns default account environment when no identifier', () => {
-      mockConfig();
-
-      expect(getConfigAccountEnvironment()).toEqual('qa');
-    });
   });
 
   describe('addConfigAccount()', () => {

config/__tests__/utils.test.ts

@@ -15,6 +15,7 @@ import {
   isConfigAccountValid,
   getAccountIdentifierAndType,
 } from '../utils';
+import { HubSpotConfigError } from '../../models/HubSpotConfigError';
 import { getCwd } from '../../lib/path';
 import {
   DeprecatedHubSpotConfigAccountFields,
@@ -195,12 +196,12 @@ describe('config/utils', () => {
       expect(result).toBe('config contents');
     });
 
-    it('throws FileSystemError on read failure', () => {
+    it('throws HubSpotConfigError on read failure', () => {
       mockFs.readFileSync.mockImplementation(() => {
         throw new Error('Read error');
       });
 
-      expect(() => readConfigFile('test')).toThrow(FileSystemError);
+      expect(() => readConfigFile('test')).toThrow(HubSpotConfigError);
     });
   });
 

lib/__tests__/personalAccessKey.test.ts

@@ -657,7 +657,7 @@ describe('lib/personalAccessKey', () => {
       );
     });
 
-    it('uses existing account name when name not provided', async () => {
+    it('uses existing account name when updating by name', async () => {
       const existingAccount = {
         accountId: 123,
         name: 'existing-name',
@@ -671,7 +671,7 @@ describe('lib/personalAccessKey', () => {
           },
         },
       };
-      getConfigDefaultAccountIfExists.mockReturnValue(existingAccount);
+      getConfigAccountIfExists.mockReturnValue(existingAccount);
 
       const freshAccessToken = 'fresh-token';
       fetchAccessToken.mockResolvedValue(
@@ -689,7 +689,12 @@ describe('lib/personalAccessKey', () => {
 
       const token = await getAccessToken('pak_123', ENVIRONMENTS.QA, 123);
 
-      await updateConfigWithAccessToken(token, 'pak_123', ENVIRONMENTS.QA);
+      await updateConfigWithAccessToken(
+        token,
+        'pak_123',
+        ENVIRONMENTS.QA,
+        'existing-name'
+      );
 
       expect(updateConfigAccount).toHaveBeenCalledWith(
         expect.objectContaining({

lib/personalAccessKey.ts

@@ -182,7 +182,7 @@ export async function updateConfigWithAccessToken(
   makeDefault = false
 ): Promise<PersonalAccessKeyConfigAccount> {
   const { portalId, accessToken, expiresAt, accountType } = token;
-  const account = name ? getConfigAccountIfExists(name) : undefined;
+  const account = getConfigAccountIfExists(portalId);
   const accountEnv = env || account?.env || ENVIRONMENTS.PROD;
 
   let parentAccountId;