Address PR comments

Author: isaacroldan

packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts

@@ -171,22 +171,24 @@ export class AppManagementClient implements DeveloperPlatformClient {
         throw new Error('AppManagementClient.session() should not be invoked dynamically in a unit test')
       }
 
-      const {appToken, userId, businessPlatformToken} = await ensureAuthenticatedAppManagementAndBusinessPlatform()
-      const userAccount = await businessPlatformRequestDoc(UserInfo, businessPlatformToken)
+      const tokenResult = await ensureAuthenticatedAppManagementAndBusinessPlatform()
+      const {appManagementToken, businessPlatformToken, userId} = tokenResult
 
-      if (userAccount.currentUserAccount) {
+      const userInfoResult = await businessPlatformRequestDoc(UserInfo, businessPlatformToken)
+
+      if (userInfoResult.currentUserAccount) {
         this._session = {
-          token: appToken,
+          token: appManagementToken,
           businessPlatformToken,
           accountInfo: {
             type: 'UserAccount',
-            email: userAccount.currentUserAccount.email,
+            email: userInfoResult.currentUserAccount.email,
           },
           userId,
         }
       } else {
         this._session = {
-          token: appToken,
+          token: appManagementToken,
           businessPlatformToken,
           accountInfo: {
             type: 'UnknownAccount',
@@ -207,15 +209,10 @@ export class AppManagementClient implements DeveloperPlatformClient {
   }
 
   async refreshToken(): Promise<string> {
-    const {appToken, businessPlatformToken} = await ensureAuthenticatedAppManagementAndBusinessPlatform(
-      [],
-      [],
-      process.env,
-      {noPrompt: true},
-    )
+    const result = await ensureAuthenticatedAppManagementAndBusinessPlatform({noPrompt: true})
     const session = await this.session()
-    session.token = appToken
-    session.businessPlatformToken = businessPlatformToken
+    session.token = result.appManagementToken
+    session.businessPlatformToken = result.businessPlatformToken
 
     return session.token
   }

packages/cli-kit/src/public/node/session.test.ts

@@ -226,7 +226,7 @@ describe('ensureAuthenticatedAppManagementAndBusinessPlatform', () => {
 
     // Then
     expect(got).toEqual({
-      appToken: 'app_management_token',
+      appManagementToken: 'app_management_token',
       businessPlatformToken: 'business_platform_token',
       userId: '1234-5678',
     })

packages/cli-kit/src/public/node/session.ts

@@ -62,18 +62,18 @@ ${outputToken.json(scopes)}
 /**
  * Ensure that we have a valid session to access the App Management API.
  *
+ * @param options - Optional extra options to use.
  * @param appManagementScopes - Optional array of extra scopes to authenticate with.
  * @param businessPlatformScopes - Optional array of extra scopes to authenticate with.
  * @param env - Optional environment variables to use.
- * @param options - Optional extra options to use.
  * @returns The access token for the App Management API.
  */
 export async function ensureAuthenticatedAppManagementAndBusinessPlatform(
+  options: EnsureAuthenticatedAdditionalOptions = {},
   appManagementScopes: AppManagementAPIScope[] = [],
   businessPlatformScopes: BusinessPlatformScope[] = [],
   env = process.env,
-  options: EnsureAuthenticatedAdditionalOptions = {},
-): Promise<{appToken: string; userId: string; businessPlatformToken: string}> {
+): Promise<{appManagementToken: string; userId: string; businessPlatformToken: string}> {
   outputDebug(outputContent`Ensuring that the user is authenticated with the App Management API with the following scopes:
 ${outputToken.json(appManagementScopes)}
 `)
@@ -87,7 +87,7 @@ ${outputToken.json(appManagementScopes)}
   }
 
   return {
-    appToken: tokens.appManagement,
+    appManagementToken: tokens.appManagement,
     userId: tokens.userId,
     businessPlatformToken: tokens.businessPlatform,
   }