From 2f3443f52562fc7a8caaccc0c147562f0d48492b Mon Sep 17 00:00:00 2001
From: Zach Halzel <zahalzel@microsoft.com>
Date: Wed, 7 Dec 2022 12:35:33 -0800
Subject: [PATCH] Fix output for app registrations

---
 ...osoftIdentityPlatformApplicationManager.cs |  2 +-
 .../Tool/MsAADTool.cs                         | 29 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/MicrosoftIdentityPlatform/MicrosoftIdentityPlatformApplicationManager.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/MicrosoftIdentityPlatform/MicrosoftIdentityPlatformApplicationManager.cs
index 8c424b2e4..83cb04c0e 100644
--- a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/MicrosoftIdentityPlatform/MicrosoftIdentityPlatformApplicationManager.cs
+++ b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/MicrosoftIdentityPlatform/MicrosoftIdentityPlatformApplicationManager.cs
@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.MSIdentity.MicrosoftIdentityPlatformApplication
 {
     public class MicrosoftIdentityPlatformApplicationManager
     {
-        private StringBuilder _output = new StringBuilder();
+        private readonly StringBuilder _output = new StringBuilder();
         const string MicrosoftGraphAppId = "00000003-0000-0000-c000-000000000000";
         const string ScopeType = "Scope";
         private const string DefaultCallbackPath = "signin-oidc";
diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/MsAADTool.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/MsAADTool.cs
index c32cc29bc..84c3735b8 100644
--- a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/MsAADTool.cs
+++ b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/MsAADTool.cs
@@ -116,7 +116,7 @@ internal async Task<string> PrintApplicationsList()
             var graphObjectsList = await GetGraphObjects();
             if (graphObjectsList is null)
             {
-                return new JsonResponse(CommandName, State.Fail, Resources.FailedToRetrieveADObjectsError).ToJsonString();
+                return new JsonResponse(CommandName, State.Fail, output: Resources.FailedToRetrieveADObjectsError).ToJsonString();
             }
 
             IList<Application> applicationList = new List<Application>();
@@ -141,22 +141,21 @@ internal async Task<string> PrintApplicationsList()
 
                 //order list by created date.
                 applicationList = applicationList.OrderByDescending(app => app.CreatedDateTime).ToList();
+            }
 
-                if (ProvisioningToolOptions.Json)
-                {
-                    JsonResponse jsonResponse = new JsonResponse(CommandName, State.Success, applicationList);
-                    outputJsonString = jsonResponse.ToJsonString();
-                }
-                else
+            if (ProvisioningToolOptions.Json)
+            {
+                outputJsonString = new JsonResponse(CommandName, State.Success, applicationList).ToJsonString();
+            }
+            else
+            {
+                Console.Write(
+                    "--------------------------------------------------------------\n" +
+                    "Application Name\t\t\t\tApplication ID\n" +
+                    "--------------------------------------------------------------\n\n");
+                foreach (var app in applicationList)
                 {
-                    Console.Write(
-                        "--------------------------------------------------------------\n" +
-                        "Application Name\t\t\t\tApplication ID\n" +
-                        "--------------------------------------------------------------\n\n");
-                    foreach (var app in applicationList)
-                    {
-                        Console.WriteLine($"{app.DisplayName.PadRight(35)}\t\t{app.AppId}");
-                    }
+                    Console.WriteLine($"{app.DisplayName.PadRight(35)}\t\t{app.AppId}");
                 }
             }