Microsoft.Identity.Web token acquisition extensions

Directory.Build.props

@@ -78,7 +78,7 @@
 
   <PropertyGroup Label="Common dependency versions">
     <MicrosoftIdentityModelVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">8.1.0</MicrosoftIdentityModelVersion>
-    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">4.64.1</MicrosoftIdentityClientVersion>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">4.65.0-preview</MicrosoftIdentityClientVersion>
     <FxCopAnalyzersVersion>3.3.0</FxCopAnalyzersVersion>
     <SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
     <AzureSecurityKeyVaultSecretsVersion>4.6.0</AzureSecurityKeyVaultSecretsVersion>

Microsoft.Identity.Web.sln

@@ -160,6 +160,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.UI",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.AotCompatibility.TestApp", "tests\Microsoft.Identity.Web.AotCompatibility.TestApp\Microsoft.Identity.Web.AotCompatibility.TestApp.csproj", "{BCE63265-6D36-423A-9C3D-BF8E448C7EA0}"
 EndProject
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -370,6 +371,10 @@ Global
 		{BCE63265-6D36-423A-9C3D-BF8E448C7EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCE63265-6D36-423A-9C3D-BF8E448C7EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCE63265-6D36-423A-9C3D-BF8E448C7EA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9592A72-8D33-47F8-A748-DEB4F204BC0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9592A72-8D33-47F8-A748-DEB4F204BC0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9592A72-8D33-47F8-A748-DEB4F204BC0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9592A72-8D33-47F8-A748-DEB4F204BC0D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+      <add key="IDDP" value="https://identitydivision.pkgs.visualstudio.com/_packaging/IDDP/nuget/v3/index.json" />
   </packageSources>
 </configuration>

src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquirer.cs

@@ -83,6 +83,7 @@ async Task<AcquireTokenResult> ITokenAcquirer.GetTokenForAppAsync(string scope,
                 UserFlow = tokenAcquisitionOptions.UserFlow,
                 PopPublicKey = tokenAcquisitionOptions.PopPublicKey,
                 PopClaim = tokenAcquisitionOptions.PopClaim,
+                ExtraParameters = tokenAcquisitionOptions.ExtraParameters,
             };
         }
     }

src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs

@@ -15,6 +15,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.Identity.Abstractions;
 using Microsoft.Identity.Client;
 using Microsoft.Identity.Client.Advanced;
@@ -57,6 +58,7 @@ class OAuthConstants
         protected readonly ITokenAcquisitionHost _tokenAcquisitionHost;
         protected readonly ICredentialsLoader _credentialsLoader;
         protected readonly ICertificatesObserver? _certificatesObserver;
+        protected readonly IOptionsMonitor<TokenAcquisitionAddInOptions> tokenAcquisitionAddInOptionsMonitor;
 
         /// <summary>
         /// Scopes which are already requested by MSAL.NET. They should not be re-requested;.
@@ -104,6 +106,7 @@ public TokenAcquisition(
             _tokenAcquisitionHost = tokenAcquisitionHost;
             _credentialsLoader = credentialsLoader;
             _certificatesObserver = serviceProvider.GetService<ICertificatesObserver>();
+            tokenAcquisitionAddInOptionsMonitor = serviceProvider.GetService<IOptionsMonitor<TokenAcquisitionAddInOptions>>();
         }
 
 #if NET6_0_OR_GREATER
@@ -384,13 +387,21 @@ public async Task<AuthenticationResult> GetAuthenticationResultForAppAsync(
                 }
             }
 
+            TokenAcquisitionAddInOptions? addInOptions = tokenAcquisitionAddInOptionsMonitor?.CurrentValue;
+
+
             // Use MSAL to get the right token to call the API
             var application = await GetOrBuildConfidentialClientApplicationAsync(mergedOptions);
 
             AcquireTokenForClientParameterBuilder builder = application
                    .AcquireTokenForClient(new[] { scope }.Except(_scopesRequestedByMsal))
                    .WithSendX5C(mergedOptions.SendX5C);
 
+            if (addInOptions!=null)
+            {
+                addInOptions.InvokeOnBeforeTokenAcquisitionForApp(builder, tokenAcquisitionOptions);
+            }
+
             // MSAL.net only allows .WithTenantId for AAD authorities. This makes sense as there should
             // not be cross tenant operations with such an authority.
             if (!mergedOptions.Instance.Contains(Constants.CiamAuthoritySuffix

src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisitionAddIn.cs

@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Identity.Abstractions;
+using Microsoft.Identity.Client;
+
+namespace Microsoft.Identity.Web
+{
+    /// <summary>
+    /// Signature for token acquisition extensions that act on the application builder.
+    /// </summary>
+    /// <param name="confidentialClientApplicationBuilder">Application builder.</param>
+    /// <param name="acquireTokenOptions">Token acquisition options.</param>
+    public delegate void BuildApplication(ConfidentialClientApplicationBuilder confidentialClientApplicationBuilder, AcquireTokenOptions acquireTokenOptions);
+
+    /// <summary>
+    /// Signature for token acquisition extensions that act on the request builder, for an app token
+    /// </summary>
+    /// <param name="builder">Builder</param>
+    /// <param name="acquireTokenOptions">Token acquisition options for the request.</param>
+    public delegate void BeforeTokenAcquisitionForApp(AcquireTokenForClientParameterBuilder builder, AcquireTokenOptions acquireTokenOptions);
+
+    /// <summary>
+    /// Signature for token acquisition extensions that act on the application builder.
+    /// </summary>
+    /// <param name="authResult">MSAL.NET authentication result</param>
+    /// <param name="acquireTokenOptions">Token acquisition options for the request.</param>
+    public delegate void AfterTokenAcquisition(AuthenticationResult authResult, AcquireTokenOptions acquireTokenOptions);
+
+    /// <summary>
+    /// Options for TokenAcquisition add-ins. These options consist in a set of events, that can be subscribed to by add-ins
+    /// or parts of the add-ins.
+    /// </summary>
+    public class TokenAcquisitionAddInOptions
+    {
+        /// <summary>
+        /// Event fired when the MSAL application needs to be built.
+        /// </summary>
+        public event BuildApplication? OnBuildConfidentialClientApplication;
+
+        /// <summary>
+        /// Event fired when a client credential flow request is being built.
+        /// </summary>        
+        public event BeforeTokenAcquisitionForApp? OnBeforeTokenAcquisitionForApp;
+
+
+        /// <summary>
+        /// Event fired when an authentication result is available.
+        /// </summary>
+        public event AfterTokenAcquisition? OnAfterTokenAcquisition;
+
+        internal void InvokeOnBuildConfidentialClientApplication(ConfidentialClientApplicationBuilder builder,
+            AcquireTokenOptions acquireTokenOptions)
+        {
+            if (OnBuildConfidentialClientApplication != null)
+            {
+                OnBuildConfidentialClientApplication(builder, acquireTokenOptions);
+            }
+        }
+
+
+        internal void InvokeOnBeforeTokenAcquisitionForApp(AcquireTokenForClientParameterBuilder builder,
+    AcquireTokenOptions acquireTokenOptions)
+        {
+            if (OnBeforeTokenAcquisitionForApp != null)
+            {
+                OnBeforeTokenAcquisitionForApp(builder, acquireTokenOptions);
+            }
+        }
+
+        internal void InvokeOnAfterTokenAcquisition(AuthenticationResult result,
+    AcquireTokenOptions acquireTokenOptions)
+        {
+            if (OnAfterTokenAcquisition != null)
+            {
+                OnAfterTokenAcquisition(result, acquireTokenOptions);
+            }
+        }
+
+    }
+}