do not call build service provider (#264)

AzureAD · Jun 28, 2020 · f2bc3a7 · f2bc3a7
1 parent f3fa25b
commit f2bc3a7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj
@@ -56,6 +56,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);DOTNET_CORE_31</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>$(DefineConstants);DOTNET_50</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- The MSAL.snk has both private and public keys -->
     <DelaySign>false</DelaySign>

diff --git a/src/Microsoft.Identity.Web/WebApiAuthenticationBuilderExtensions.cs b/src/Microsoft.Identity.Web/WebApiAuthenticationBuilderExtensions.cs
@@ -79,9 +79,16 @@ public static AuthenticationBuilder AddMicrosoftWebApi(
             builder.Services.AddSingleton<IJwtBearerMiddlewareDiagnostics, JwtBearerMiddlewareDiagnostics>();
             builder.Services.AddHttpClient();
 
+#if DOTNET_CORE_31
             // Change the authentication configuration to accommodate the Microsoft identity platform endpoint (v2.0).
             builder.AddJwtBearer(jwtBearerScheme, options =>
             {
+            // TODO: replace by the work around that @Tratcher will provider
+                IServiceProvider serviceProvider = builder.Services.BuildServiceProvider();
+#else
+            builder.AddJwtBearer<IServiceProvider>(jwtBearerScheme, (options, serviceProvider) =>
+            {
+#endif
                 // TODO:
                 // Suspect. Why not get the IOption<MicrosoftIdentityOptions>?
                 MicrosoftIdentityOptions microsoftIdentityOptions = new MicrosoftIdentityOptions(); // configuration.GetSection(configSectionName).Get<MicrosoftIdentityOptions>();
@@ -142,7 +149,7 @@ public static AuthenticationBuilder AddMicrosoftWebApi(
 
                 if (subscribeToJwtBearerMiddlewareDiagnosticsEvents)
                 {
-                    var diags = builder.Services.BuildServiceProvider().GetRequiredService<IJwtBearerMiddlewareDiagnostics>();
+                    var diags = serviceProvider.GetRequiredService<IJwtBearerMiddlewareDiagnostics>();
 
                     diags.Subscribe(options.Events);
                 }

diff --git a/src/Microsoft.Identity.Web/WebAppAuthenticationBuilderExtensions.cs b/src/Microsoft.Identity.Web/WebAppAuthenticationBuilderExtensions.cs
@@ -95,8 +95,16 @@ public static AuthenticationBuilder AddMicrosoftWebApp(
 
             builder.Services.AddSingleton<IOpenIdConnectMiddlewareDiagnostics, OpenIdConnectMiddlewareDiagnostics>();
             builder.AddCookie(cookieScheme);
+
+#if DOTNET_CORE_31
             builder.AddOpenIdConnect(openIdConnectScheme, options =>
             {
+                // TODO: replace by the work around that @Tratcher will provider
+                IServiceProvider serviceProvider = builder.Services.BuildServiceProvider();
+#else
+            builder.AddOpenIdConnect<IServiceProvider>(openIdConnectScheme, (options, serviceProvider) =>
+            {
+#endif
                 options.SignInScheme = cookieScheme;
 
                 if (string.IsNullOrWhiteSpace(options.Authority))
@@ -180,7 +188,7 @@ public static AuthenticationBuilder AddMicrosoftWebApp(
 
                 if (subscribeToOpenIdConnectMiddlewareDiagnosticsEvents)
                 {
-                    var diags = builder.Services.BuildServiceProvider().GetRequiredService<IOpenIdConnectMiddlewareDiagnostics>();
+                    var diags = serviceProvider.GetRequiredService<IOpenIdConnectMiddlewareDiagnostics>();
 
                     diags.Subscribe(options.Events);
                 }