Merge pull request #88 from dlmelendez/rel/6.0

Rel/6.0
dlmelendez · Feb 6, 2022 · 10a0fea · 10a0fea
2 parents 7070e66 + 49480f2
commit 10a0fea
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityRole.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityRole.cs
@@ -5,6 +5,7 @@
 using System;
 using Azure.Data.Tables;
 using Azure;
+using System.Runtime.Serialization;
 
 namespace ElCamino.AspNetCore.Identity.AzureTable.Model
 {
@@ -40,7 +41,7 @@ public IdentityRole(string roleName)
             base.Name = roleName;
         }
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override string Id
         {
             get
@@ -67,7 +68,7 @@ public IdentityRole() : base()
         {
         }
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override TKey Id { get; set; }
 
 

diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityRoleClaim.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityRoleClaim.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -35,7 +36,7 @@ public string PeekRowKey(IKeyHelper keyHelper)
 
         public double KeyVersion { get; set; }
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override string RoleId
         {
             get

diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUser.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUser.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -75,7 +76,7 @@ public IdentityUser()
         /// <summary>
         /// LockoutEnd is stored as LockoutEndDateUtc for backwards compat.
         /// </summary>
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override DateTimeOffset? LockoutEnd
         {
             get

diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUserRole.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUserRole.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -59,7 +60,7 @@ public class IdentityUserRole<TKey> : Microsoft.AspNetCore.Identity.IdentityUser
         public DateTimeOffset? Timestamp { get; set; }
         public ETag ETag { get; set; } = ETag.All;
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override TKey RoleId { get; set; }
 
         public string RoleName { get; set; }

diff --git a/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUserToken.cs b/src/ElCamino.AspNetCore.Identity.AzureTable.Model/IdentityUserToken.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -46,10 +47,10 @@ public class IdentityUserToken<TKey> : Microsoft.AspNetCore.Identity.IdentityUse
         public DateTimeOffset? Timestamp { get; set; }
         public ETag ETag { get; set; } = ETag.All;
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override string Name { get => base.Name; set => base.Name = value; }
 
-        //[IgnoreProperty]
+        [IgnoreDataMember]
         public override string Value { get => base.Value; set => base.Value = value; }
 
         //These properties are more descriptive fields in storage, also allows for backcompat

diff --git a/src/ElCamino.Identity.AzureTable.DataUtility/ElCamino.Identity.AzureTable.DataUtility.csproj b/src/ElCamino.Identity.AzureTable.DataUtility/ElCamino.Identity.AzureTable.DataUtility.csproj
@@ -29,6 +29,7 @@
     <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\IdentityCloudContext.cs" />
     <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\IdentityResources.Designer.cs" />
     <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\RoleStore.cs" />
+    <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\TableConstants.cs" />
     <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\UserOnlyStore.cs" />
     <Compile Remove="..\ElCamino.AspNetCore.Identity.AzureTable\UserStore.cs" />
     <EmbeddedResource Include=".\help.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />

diff --git a/src/ElCamino.Identity.AzureTable.DataUtility/Program.cs b/src/ElCamino.Identity.AzureTable.DataUtility/Program.cs
@@ -63,15 +63,13 @@ public static void Main(string[] args)
             IdentityConfiguration sourceConfig = new IdentityConfiguration();
             sourceConfig.TablePrefix = Configuration.GetSection("source:IdentityConfiguration:TablePrefix")?.Value;
             sourceConfig.StorageConnectionString = Configuration.GetSection("source:IdentityConfiguration:StorageConnectionString")?.Value;
-            sourceConfig.LocationMode = Configuration.GetSection("source:IdentityConfiguration:LocationMode")?.Value ?? string.Empty;
             sourceConfig.UserTableName = Configuration.GetSection("source:IdentityConfiguration:UserTableName")?.Value ?? string.Empty;
             sourceConfig.IndexTableName = Configuration.GetSection("source:IdentityConfiguration:IndexTableName")?.Value ?? string.Empty;
             sourceConfig.RoleTableName = Configuration.GetSection("source:IdentityConfiguration:RoleTableName")?.Value ?? string.Empty;
 
             IdentityConfiguration targetConfig = new IdentityConfiguration();
             targetConfig.TablePrefix = Configuration.GetSection("target:IdentityConfiguration:TablePrefix")?.Value;
             targetConfig.StorageConnectionString = Configuration.GetSection("target:IdentityConfiguration:StorageConnectionString")?.Value;
-            targetConfig.LocationMode = Configuration.GetSection("target:IdentityConfiguration:LocationMode")?.Value ?? string.Empty;
             targetConfig.UserTableName = Configuration.GetSection("target:IdentityConfiguration:UserTableName")?.Value ?? string.Empty;
             targetConfig.IndexTableName = Configuration.GetSection("target:IdentityConfiguration:IndexTableName")?.Value ?? string.Empty;
             targetConfig.RoleTableName = Configuration.GetSection("target:IdentityConfiguration:RoleTableName")?.Value ?? string.Empty;

diff --git a/tests/ElCamino.AspNetCore.Identity.AzureTable.Tests/config.json b/tests/ElCamino.AspNetCore.Identity.AzureTable.Tests/config.json
@@ -9,7 +9,7 @@
   },
   "IdentityAzureTable": {
     "identityConfiguration": {
-      "tablePrefix": "av22",
+      "tablePrefix": "av60",
       "indexTableName": "indexes",
       "userTableName": "users",
       "roleTableName": "roles",