Jmprieur/related to249 (#271)

* Changed the DI pattern for Token Acquisition interfaces. (#258) * Update src/Microsoft.Identity.Web/ServiceCollectionExtensions.cs Co-authored-by: jennyf19 <jeferrie@microsoft.com> Co-authored-by: pmaytak <34331512+pmaytak@users.noreply.github.com> Co-authored-by: jennyf19 <jeferrie@microsoft.com>
AzureAD · Jun 29, 2020 · 1593428 · 1593428
1 parent 8578da9
commit 1593428
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/Microsoft.Identity.Web/ServiceCollectionExtensions.cs b/src/Microsoft.Identity.Web/ServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Identity.Web
@@ -39,6 +40,23 @@ public static IServiceCollection AddTokenAcquisition(
                 throw new ArgumentNullException(nameof(services));
             }
 
+            ServiceDescriptor tokenAcquisitionService = services.FirstOrDefault(s => s.ServiceType == typeof(ITokenAcquisition));
+            ServiceDescriptor tokenAcquisitionInternalService = services.FirstOrDefault(s => s.ServiceType == typeof(ITokenAcquisitionInternal));
+            if (tokenAcquisitionService != null && tokenAcquisitionInternalService != null)
+            {
+                if (isTokenAcquisitionSingleton ^ (tokenAcquisitionService.Lifetime == ServiceLifetime.Singleton))
+                {
+                    // The service was already added, but not with the right lifetime
+                    services.Remove(tokenAcquisitionService);
+                    services.Remove(tokenAcquisitionInternalService);
+                }
+                else
+                {
+                    // The service is already added with the right lifetime
+                    return services;
+                }
+            }
+
             // Token acquisition service
             services.AddHttpContextAccessor();
             if (isTokenAcquisitionSingleton)

diff --git a/tests/WebAppCallsMicrosoftGraph/MicrosoftGraphServiceExtensions.cs b/tests/WebAppCallsMicrosoftGraph/MicrosoftGraphServiceExtensions.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Graph;
@@ -27,7 +29,7 @@ public static void AddMicrosoftGraph(this IServiceCollection services,
             // Graph base URL
             string graphBaseUrl = configuration.GetValue<string>(graphBaseUrlKey);
 
-
+            services.AddTokenAcquisition(true);
             services.AddSingleton<GraphServiceClient, GraphServiceClient>(serviceProvider =>
             {
                 var tokenAquisitionService = serviceProvider.GetService<ITokenAcquisition>();

diff --git a/tests/WebAppCallsMicrosoftGraph/appsettings.json b/tests/WebAppCallsMicrosoftGraph/appsettings.json
@@ -4,9 +4,7 @@
         "Domain": "qualified.domain.name",
         "TenantId": "22222222-2222-2222-2222-222222222222",
         "ClientId": "11111111-1111-1111-11111111111111111",
-        "CallbackPath": "/signin-oidc",
-
-        "SingletonTokenAcquisition": true
+        "CallbackPath": "/signin-oidc"
     },
     "MicrosoftGraphBaseUrl": "https://graph.microsoft.com/beta",