Migrate to Azure.Identity

From Microsoft.Azure.Services.AppAuthentication
WCOMAB · Aug 29, 2023 · e84fe35 · e84fe35
1 parent ca0089f
commit e84fe35
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/SqlBulkSyncFunction/Program.cs b/src/SqlBulkSyncFunction/Program.cs
@@ -13,7 +13,7 @@
                     (settings, configuration) => configuration.GetSection(nameof(SyncJobsConfig)).Bind(settings));
 
             configure
-                .AddSingleton<Microsoft.Azure.Services.AppAuthentication.AzureServiceTokenProvider>()
+                .AddSingleton<Azure.Identity.DefaultAzureCredential>()
                 .AddSingleton<IAzureSqlTokenService, AzureSqlTokenService>()
                 .AddSingleton<IProcessSyncJobService, ProcessSyncJobService>()
                 .AddSingleton<ITokenCacheService, TokenCacheService>();

diff --git a/src/SqlBulkSyncFunction/Services/AzureSqlTokenService.cs b/src/SqlBulkSyncFunction/Services/AzureSqlTokenService.cs
@@ -1,14 +1,27 @@
-using System.Threading.Tasks;
-using Microsoft.Azure.Services.AppAuthentication;
+using System;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Identity;
 
-namespace SqlBulkSyncFunction.Services
+namespace SqlBulkSyncFunction.Services;
+
+public record AzureSqlTokenService(DefaultAzureCredential DefaultAzureCredential) : IAzureSqlTokenService
 {
-    // ReSharper disable once UnusedMember.Global
-    public record AzureSqlTokenService(AzureServiceTokenProvider AzureServiceTokenProvider) : IAzureSqlTokenService
-    {
-        private const string AzureSqlResourceId = "https://database.windows.net/";
-
-        public async Task<string> GetAccessToken(string tenantId)
-            => await AzureServiceTokenProvider.GetAccessTokenAsync(AzureSqlResourceId, string.IsNullOrWhiteSpace(tenantId) ? null : tenantId);
-    }
+    private const string AzureSqlResourceId = "https://database.windows.net/";
+    private static AccessToken? AccessToken = default;
+
+
+    public async Task<string> GetAccessToken(string tenantId)
+        => (
+                AccessToken is { } validToken && validToken.ExpiresOn < DateTimeOffset.UtcNow.AddMinutes(5)
+                        ? validToken
+                        : (AccessToken = await DefaultAzureCredential.GetTokenAsync(
+                            new TokenRequestContext(
+                                new[] { AzureSqlResourceId },
+                                tenantId: string.IsNullOrWhiteSpace(tenantId) ? null : tenantId
+                                )
+                            )
+                ).Value
+            ).Token;
 }
+
diff --git a/src/SqlBulkSyncFunction/SqlBulkSyncFunction.csproj b/src/SqlBulkSyncFunction/SqlBulkSyncFunction.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.2.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.14.1" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
-    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
+    <PackageReference Include="Azure.Identity" Version="1.10.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
   </ItemGroup>
   <ItemGroup>