Adding debug statements for MSAL and the New-PartnerAccessToken comma…

…nd (#164)

ChangeLog.md

@@ -20,6 +20,11 @@
 
 # Change Log
 
+## 2.0.1909.4
+
+* Authentication 
+  * Log events from the Microsoft Authentication Library (MSAL) will now be written to the console when the debug flag is set
+
 ## 2.0.1909.3
 
 * Authentication

src/PowerShell/Authenticators/RefreshTokenAuthenticator.cs

@@ -31,7 +31,7 @@ public override async Task<AuthenticationResult> AuthenticateAsync(Authenticatio
             }
 
             return await app.AsRefreshTokenClient().AcquireTokenByRefreshToken(
-                null,
+                parameters.Scopes,
                 parameters.Account.GetProperty(PartnerAccountPropertyType.RefreshToken)).ExecuteAsync().ConfigureAwait(false);
         }
 

src/PowerShell/Commands/ContextPSCmdlet.cs

@@ -20,6 +20,14 @@ protected override void BeginProcessing()
             PartnerSession.Instance.RegisterComponent("WriteWarning", () => WriteWarningEvent);
         }
 
+        public void FlushDebugMessages()
+        {
+            while (PartnerSession.Instance.DebugMessages.TryDequeue(out string message))
+            {
+                WriteDebug(message);
+            }
+        }
+
         private void WriteWarningSender(object sender, StreamEventArgs args)
         {
             WriteWarning(args.Message);

src/PowerShell/Commands/NewPartnerAccessToken.cs

@@ -16,7 +16,7 @@ namespace Microsoft.Store.PartnerCenter.PowerShell.Commands
 
     [Cmdlet(VerbsCommon.New, "PartnerAccessToken")]
     [OutputType(typeof(AuthResult))]
-    public class NewPartnerAccessToken : PSCmdlet
+    public class NewPartnerAccessToken : ContextPSCmdlet
     {
         /// <summary>
         /// The name of the access token parameter set.
@@ -224,6 +224,7 @@ protected override void ProcessRecord()
                 result.RefreshToken = tokens[key].Secret;
             }
 
+            FlushDebugMessages();
             WriteObject(result);
         }
 

src/PowerShell/Factories/SharedTokenCacheClientFactory.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Store.PartnerCenter.PowerShell.Factories
     using System.Security.Cryptography.X509Certificates;
     using Identity.Client;
     using Identity.Client.Extensions.Msal;
+    using Models.Authentication;
     using Utilities;
 
     public static class SharedTokenCacheClientFactory
@@ -71,7 +72,11 @@ public static IConfidentialClientApplication CreateConfidentialClient(
                 builder = builder.WithTenantId(tenantId);
             }
 
-            IConfidentialClientApplication client = builder.Build();
+            IConfidentialClientApplication client = builder.WithLogging(
+                DebugLoggingMethod,
+                LogLevel.Info,
+                enablePiiLogging: false,
+                enableDefaultPlatformLogging: true).Build();
 
             MsalCacheHelper cacheHelper = InitializeCacheHelper(clientId);
             cacheHelper.RegisterCache(client.UserTokenCache);
@@ -102,7 +107,11 @@ public static IPublicClientApplication CreatePublicClient(
                 builder = builder.WithTenantId(tenantId);
             }
 
-            IPublicClientApplication client = builder.Build();
+            IPublicClientApplication client = builder.WithLogging(
+                DebugLoggingMethod,
+                LogLevel.Info,
+                enablePiiLogging: false,
+                enableDefaultPlatformLogging: true).Build();
             MsalCacheHelper cacheHelper = InitializeCacheHelper(clientId);
 
             cacheHelper.RegisterCache(client.UserTokenCache);
@@ -121,5 +130,10 @@ public static ITokenCache GetTokenCache(string clientId)
 
             return tokenCache;
         }
+
+        private static void DebugLoggingMethod(LogLevel level, string message, bool containsPii)
+        {
+            PartnerSession.Instance.DebugMessages.Enqueue($"MSAL {level} {containsPii} {message}");
+        }
     }
 }

src/PowerShell/Models/Authentication/PartnerSession.cs

@@ -44,6 +44,11 @@ public class PartnerSession
         /// </summary>
         public PartnerContext Context { get; set; }
 
+        /// <summary>
+        /// Gets the queue of debug messages.
+        /// </summary>
+        public ConcurrentQueue<string> DebugMessages { get; } = new ConcurrentQueue<string>();
+
         /// <summary>
         /// Gets an instance of the <see cref="PartnerSession" /> class.
         /// </summary>

src/PowerShell/PartnerCenter.psd1

@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 09/18/2019
+# Generated on: 09/19/2019
 #
 
 @{
     # Script module or binary module file associated with this manifest.
     RootModule = 'PartnerCenter.psm1'
 
     # Version number of this module.
-    ModuleVersion = '2.0.1909.3'
+    ModuleVersion = '2.0.1909.4'
 
     # Supported PSEditions
     CompatiblePSEditions = 'Core', 'Desktop'

src/PowerShell/PowerShell.csproj

@@ -11,17 +11,16 @@
     <Product>Partner Center PowerShell</Product>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Copyright>Copyright © 2019</Copyright>
-    <PackageLicenseUrl>https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(RepoArtifacts)$(Configuration)\</OutputPath>
     <PublishDir>$(OutputPath)</PublishDir>
-    <Version>2.0.1909.3</Version>
+    <Version>2.0.1909.4</Version>
     <LangVersion>latest</LangVersion>
-    <AssemblyVersion>2.0.1909.3</AssemblyVersion>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>