Merge pull request #821 from davidchesnut/patch-1

Fix check for Microsoft Azure CLI substring
OfficeDev · Dec 13, 2023 · 0c210e9 · 0c210e9
2 parents 1370c25 + 82ecd50
commit 0c210e9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/office-addin-sso/src/configure.ts b/packages/office-addin-sso/src/configure.ts
@@ -54,7 +54,12 @@ export async function isAzureCliInstalled(): Promise<boolean> {
       case "win32": {
         const appsInstalledWindowsCommand: string = `powershell -ExecutionPolicy Bypass -File "${defaults.getInstalledAppsPath}"`;
         const appsWindows: any = await promiseExecuteCommand(appsInstalledWindowsCommand);
-        cliInstalled = appsWindows.filter((app) => app.DisplayName === "Microsoft Azure CLI").length > 0;
+        cliInstalled = appsWindows.filter((app) => {
+          if (app!==null && app.DisplayName!==null){
+            if (app.DisplayName.includes("Microsoft Azure CLI")) return true;
+          }
+          return false;
+        });
         // Send usage data
         usageDataObject.reportSuccess("isAzureCliInstalled()", {
           cliInstalled: cliInstalled,