Fixes prompting for entra app. Closes pnp#6498

waldekmastykarz · Nov 20, 2024 · cd6f05b · cd6f05b
1 parent 6c6be23
commit cd6f05b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/m365/base/AppCommand.spec.ts b/src/m365/base/AppCommand.spec.ts
@@ -142,7 +142,10 @@ describe('AppCommand', () => {
         }
       ]
     }));
-    sinon.stub(cli, 'handleMultipleResultsFound').resolves({ appIdIndex: 1 });
+    sinon.stub(cli, 'handleMultipleResultsFound').resolves({
+      "appId": "9c79078b-815e-4a3e-bb80-2aaf2d9e9b3d",
+      "name": "CLI app1"
+    });
     sinon.stub(Command.prototype, 'action').resolves();
 
     try {

diff --git a/src/m365/base/AppCommand.ts b/src/m365/base/AppCommand.ts
@@ -90,9 +90,12 @@ export default abstract class AppCommand extends Command {
     }
 
     if (this.m365rcJson.apps.length > 1) {
-      const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
-      const result = await cli.handleMultipleResultsFound<{ appIdIndex: number }>(`Multiple Entra apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
-      this.appId = ((this.m365rcJson as M365RcJson).apps as M365RcJsonApp[])[result.appIdIndex].appId;
+      this.m365rcJson.apps.forEach((app, index) => {
+        (app as any).appIdIndex = index;
+      });
+      const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', this.m365rcJson.apps);
+      const result = await cli.handleMultipleResultsFound<M365RcJsonApp>(`Multiple Entra apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
+      this.appId = result.appId;
       await super.action(logger, args);
     }
   }