Allow TokenCredentials to be passed in (supporting Managed Identities…

… instead of Shared Access Keys)
ledgerscope · Jan 30, 2024 · c81af12 · c81af12
1 parent 1799ac8
commit c81af12
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityConfiguration.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityConfiguration.cs
@@ -1,6 +1,9 @@
 // MIT License Copyright 2020 (c) David Melendez. All rights reserved. See License.txt in the project root for license information.
 
 
+using System;
+using Azure.Core;
+
 namespace ElCamino.AspNetCore.Identity.AzureTable.Model
 {
     /// <summary>
@@ -33,5 +36,8 @@ public class IdentityConfiguration
         /// </summary>
         public string? RoleTableName { get; set; }
 
+        public Uri? StorageConnectionUri { get; set; }
+        public TokenCredential? TokenCredential { get; set; }
+
     }
 }
diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable/IdentityCloudContext.cs b/src/ElCamino.AspNetCore.Identity.AzureTable/IdentityCloudContext.cs
@@ -30,10 +30,35 @@ public IdentityCloudContext(IdentityConfiguration config)
             }
 #endif
 
-            _client = new TableServiceClient(config.StorageConnectionString);
-            _indexTable = _client.GetTableClient(FormatTableNameWithPrefix(config!.TablePrefix, !string.IsNullOrWhiteSpace(config!.IndexTableName) ? config!.IndexTableName! : TableConstants.TableNames.IndexTable));
-            _roleTable = _client.GetTableClient(FormatTableNameWithPrefix(config!.TablePrefix, !string.IsNullOrWhiteSpace(config!.RoleTableName) ? config!.RoleTableName! : TableConstants.TableNames.RolesTable));
-            _userTable = _client.GetTableClient(FormatTableNameWithPrefix(config!.TablePrefix, !string.IsNullOrWhiteSpace(config!.UserTableName) ? config!.UserTableName! : TableConstants.TableNames.UsersTable));
+            if (string.IsNullOrEmpty(config.StorageConnectionString) && config.StorageConnectionUri == null)
+            {
+                throw new ArgumentNullException(nameof(config.StorageConnectionString), "Either StorageConnectionString or StorageConnectionUri are required");
+            }
+            else if (!string.IsNullOrEmpty(config.StorageConnectionString))
+            {
+                _client = new TableServiceClient(config.StorageConnectionString);
+
+                if (config.TokenCredential != null)
+                {
+                    //If we've been passed a TokenCredential we can use that instead of the credentials in the connection string
+                    _client = new TableServiceClient(_client.Uri, config.TokenCredential);
+                }
+            }
+            else // if (config.StorageConnectionUri != null)
+            {
+                if (config.TokenCredential == null)
+                {
+                    throw new ArgumentNullException(nameof(config.TokenCredential), "TokenCredential is required when Uri is specified");
+                }
+                else
+                {
+                    _client = new TableServiceClient(config.StorageConnectionUri, config.TokenCredential);
+                }
+            }
+
+            _indexTable = _client.GetTableClient(FormatTableNameWithPrefix(config.TablePrefix, !string.IsNullOrWhiteSpace(config.IndexTableName) ? config.IndexTableName : TableConstants.TableNames.IndexTable));
+            _roleTable = _client.GetTableClient(FormatTableNameWithPrefix(config.TablePrefix, !string.IsNullOrWhiteSpace(config.RoleTableName) ? config.RoleTableName : TableConstants.TableNames.RolesTable));
+            _userTable = _client.GetTableClient(FormatTableNameWithPrefix(config.TablePrefix, !string.IsNullOrWhiteSpace(config.UserTableName) ? config.UserTableName : TableConstants.TableNames.UsersTable));
         }
 
         private static string FormatTableNameWithPrefix(string? tablePrefix, string baseTableName)