Merge pull request #351 from dotnet/hold-auth-context

Ensure auth context is reused across calls for caching
dotnet · Feb 27, 2021 · 0413bfc · 0413bfc
2 parents cb72bd0 + a858dda
commit 0413bfc
Showing 1 changed file with 39 additions and 29 deletions.
diff --git a/src/SignClient/SignCommand.cs b/src/SignClient/SignCommand.cs
@@ -121,41 +121,51 @@ CommandOption maxConcurrency
 
                 var configuration = builder.Build();
 
-                // Setup Refit
-                var settings = new RefitSettings
+
+                Func<Task<string>> getAccessToken;
+
+
+                var authority = $"{configuration["SignClient:AzureAd:AADInstance"]}{configuration["SignClient:AzureAd:TenantId"]}";
+
+                var clientId = configuration["SignClient:AzureAd:ClientId"];
+                var resourceId = configuration["SignClient:Service:ResourceId"];
+
+                // See if we have a Username option
+                if (username.HasValue())
                 {
-                    AuthorizationHeaderValueGetter = async () =>
-                    {
-                        var authority = $"{configuration["SignClient:AzureAd:AADInstance"]}{configuration["SignClient:AzureAd:TenantId"]}";
+                    // ROPC flow
+                    var pca = PublicClientApplicationBuilder.Create(clientId)
+                                                            .WithAuthority(authority)
+                                                            .Build();
 
-                        var clientId = configuration["SignClient:AzureAd:ClientId"];
-                        var resourceId = configuration["SignClient:Service:ResourceId"];
+                    var secret = new NetworkCredential("", clientSecret.Value()).SecurePassword;
 
-                        // See if we have a Username option
-                        if (username.HasValue())
-                        {
-                            // ROPC flow
-                            var pca = PublicClientApplicationBuilder.Create(clientId)
-                                                                    .WithAuthority(authority)
-                                                                    .Build();
+                    getAccessToken = async () =>
+                    {
+                        var tokenResult = await pca.AcquireTokenByUsernamePassword(new[] { $"{resourceId}/user_impersonation" }, username.Value(), secret).ExecuteAsync();
 
-                            var secret = new NetworkCredential("", clientSecret.Value()).SecurePassword;
+                        return tokenResult.AccessToken;
+                    };
+                }
+                else
+                {
+                    var context = ConfidentialClientApplicationBuilder.Create(clientId)
+                                                                      .WithAuthority(authority)
+                                                                      .WithClientSecret(clientSecret.Value())
+                                                                      .Build();
 
-                            var tokenResult = await pca.AcquireTokenByUsernamePassword(new[] { $"{resourceId}/user_impersonation" }, username.Value(), secret).ExecuteAsync();
+                    getAccessToken = async () =>
+                    {
+                        // Client credential flow
+                        var res = await context.AcquireTokenForClient(new[] { $"{resourceId}/.default" }).ExecuteAsync();
+                        return res.AccessToken;
+                    };                    
+                }
 
-                            return tokenResult.AccessToken;
-                        }
-                        else
-                        {
-                            var context = ConfidentialClientApplicationBuilder.Create(clientId)
-                                                                              .WithAuthority(authority)
-                                                                              .WithClientSecret(clientSecret.Value())
-                                                                              .Build();
-                            // Client credential flow
-                            var res = await context.AcquireTokenForClient(new[] { $"{resourceId}/.default" }).ExecuteAsync();
-                            return res.AccessToken;
-                        }
-                    }
+                // Setup Refit
+                var settings = new RefitSettings
+                {
+                    AuthorizationHeaderValueGetter = getAccessToken
                 };