Implement IUserClaimStore

Author: g0t4

src/AspNet.Identity.MongoDB/AspNet.Identity.MongoDB.csproj

@@ -53,6 +53,7 @@
   <ItemGroup>
     <Compile Include="IdentityContext.cs" />
     <Compile Include="IdentityUser.cs" />
+    <Compile Include="IdentityUserClaim.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UserStore.cs" />
   </ItemGroup>

src/AspNet.Identity.MongoDB/AspNet.Identity.MongoDB.nuspec

@@ -10,7 +10,7 @@
     <iconUrl>https://github.com/g0t4/aspnet-identity-mongo</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A mongodb provider for the new ASP.NET Identity framework. My aim is to ensure this project is well tested and configurable.</description>
-    <releaseNotes>Adding IUserSecurityStampStore, IUserConfirmationStore, IUserEmailStore interfaces.</releaseNotes>
+    <releaseNotes>Adding IUserSecurityStampStore, IUserConfirmationStore, IUserEmailStore and IUserClaimStore interfaces.</releaseNotes>
     <copyright>MIT</copyright>
     <tags>mongo mongodb aspnet identity</tags>
   </metadata>

src/AspNet.Identity.MongoDB/IdentityUser.cs

@@ -3,6 +3,7 @@
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
+	using System.Security.Claims;
 	using global::MongoDB.Bson;
 	using global::MongoDB.Bson.Serialization.Attributes;
 	using Microsoft.AspNet.Identity;
@@ -14,6 +15,7 @@ public IdentityUser()
 			Id = ObjectId.GenerateNewId().ToString();
 			Roles = new List<string>();
 			Logins = new List<UserLoginInfo>();
+			Claims = new List<IdentityUserClaim>();
 		}
 
 		[BsonRepresentation(BsonType.ObjectId)]
@@ -79,5 +81,22 @@ public virtual bool HasPassword()
 		{
 			return false;
 		}
+
+		[BsonIgnoreIfNull]
+		public List<IdentityUserClaim> Claims { get; set; }
+
+		public virtual void AddClaim(Claim claim)
+		{
+			Claims.Add(new IdentityUserClaim(claim));
+		}
+
+		public virtual void RemoveClaim(Claim claim)
+		{
+			var claimsToRemove = Claims
+				.Where(c => c.Type == claim.Type)
+				.Where(c => c.Value == claim.Value);
+
+			Claims = Claims.Except(claimsToRemove).ToList();
+		}
 	}
 }

src/AspNet.Identity.MongoDB/IdentityUserClaim.cs

@@ -0,0 +1,25 @@
+namespace AspNet.Identity.MongoDB
+{
+	using System.Security.Claims;
+
+	public class IdentityUserClaim
+	{
+		public IdentityUserClaim()
+		{
+		}
+
+		public IdentityUserClaim(Claim claim)
+		{
+			Type = claim.Type;
+			Value = claim.Value;
+		}
+
+		public string Type { get; set; }
+		public string Value { get; set; }
+
+		public Claim ToSecurityClaim()
+		{
+			return new Claim("type", "value");
+		}
+	}
+}

src/AspNet.Identity.MongoDB/UserStore.cs

@@ -2,13 +2,14 @@
 {
 	using System.Collections.Generic;
 	using System.Linq;
+	using System.Security.Claims;
 	using System.Threading.Tasks;
 	using global::MongoDB.Bson;
 	using global::MongoDB.Driver.Builders;
 	using global::MongoDB.Driver.Linq;
 	using Microsoft.AspNet.Identity;
 
-	public class UserStore<TUser> : IUserStore<TUser>, IUserPasswordStore<TUser>, IUserRoleStore<TUser>, IUserLoginStore<TUser>, IUserSecurityStampStore<TUser>, IUserConfirmationStore<TUser>, IUserEmailStore<TUser>
+	public class UserStore<TUser> : IUserStore<TUser>, IUserPasswordStore<TUser>, IUserRoleStore<TUser>, IUserLoginStore<TUser>, IUserSecurityStampStore<TUser>, IUserConfirmationStore<TUser>, IUserEmailStore<TUser>, IUserClaimStore<TUser>
 		where TUser : IdentityUser
 	{
 		private readonly IdentityContext _Context;
@@ -152,5 +153,22 @@ public Task<TUser> FindByEmailAsync(string email)
 			// todo what if a user can have multiple accounts with the same email?
 			return Task.Run(() => _Context.Users.AsQueryable<TUser>().FirstOrDefault(u => u.Email == email));
 		}
+
+		public Task<IList<Claim>> GetClaimsAsync(TUser user)
+		{
+			return Task.FromResult((IList<Claim>) user.Claims.Select(c => c.ToSecurityClaim()).ToList());
+		}
+
+		public Task AddClaimAsync(TUser user, Claim claim)
+		{
+			user.AddClaim(claim);
+			return Task.FromResult(0);
+		}
+
+		public Task RemoveClaimAsync(TUser user, Claim claim)
+		{
+			user.RemoveClaim(claim);
+			return Task.FromResult(0);
+		}
 	}
 }

src/IntegrationTests/IntegrationTests.csproj

@@ -60,6 +60,7 @@
     <Compile Include="IdentityContextTests.cs" />
     <Compile Include="IdentityUserTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserClaimStoreTests.cs" />
     <Compile Include="UserConfirmationStoreTests.cs" />
     <Compile Include="UserEmailStoreTests.cs" />
     <Compile Include="UserIntegrationTestsBase.cs" />

src/IntegrationTests/UserClaimStoreTests.cs

@@ -0,0 +1,77 @@
+namespace IntegrationTests
+{
+	using System.Linq;
+	using System.Security.Claims;
+	using AspNet.Identity.MongoDB;
+	using Microsoft.AspNet.Identity;
+	using NUnit.Framework;
+
+	[TestFixture]
+	public class UserClaimStoreTests : UserIntegrationTestsBase
+	{
+		[Test]
+		public void Create_NewUser_HasNoClaims()
+		{
+			var user = new IdentityUser {UserName = "bob"};
+			var manager = GetUserManager();
+			manager.Create(user);
+
+			var claims = manager.GetClaims(user.Id);
+
+			Expect(claims, Is.Empty);
+		}
+
+		[Test]
+		public void AddClaim_ReturnsClaim()
+		{
+			var user = new IdentityUser {UserName = "bob"};
+			var manager = GetUserManager();
+			manager.Create(user);
+
+			manager.AddClaim(user.Id, new Claim("type", "value"));
+
+			var claim = manager.GetClaims(user.Id).Single();
+			Expect(claim.Type, Is.EqualTo("type"));
+			Expect(claim.Value, Is.EqualTo("value"));
+		}
+
+		[Test]
+		public void RemoveClaim_RemovesExistingClaim()
+		{
+			var user = new IdentityUser {UserName = "bob"};
+			var manager = GetUserManager();
+			manager.Create(user);
+			manager.AddClaim(user.Id, new Claim("type", "value"));
+
+			manager.RemoveClaim(user.Id, new Claim("type", "value"));
+
+			Expect(manager.GetClaims(user.Id), Is.Empty);
+		}
+
+		[Test]
+		public void RemoveClaim_DifferentType_DoesNotRemoveClaim()
+		{
+			var user = new IdentityUser { UserName = "bob" };
+			var manager = GetUserManager();
+			manager.Create(user);
+			manager.AddClaim(user.Id, new Claim("type", "value"));
+
+			manager.RemoveClaim(user.Id, new Claim("otherType", "value"));
+
+			Expect(manager.GetClaims(user.Id), Is.Not.Empty);
+		}
+
+		[Test]
+		public void RemoveClaim_DifferentValue_DoesNotRemoveClaim()
+		{
+			var user = new IdentityUser { UserName = "bob" };
+			var manager = GetUserManager();
+			manager.Create(user);
+			manager.AddClaim(user.Id, new Claim("type", "value"));
+
+			manager.RemoveClaim(user.Id, new Claim("type", "otherValue"));
+
+			Expect(manager.GetClaims(user.Id), Is.Not.Empty);
+		}
+	}
+}

src/Tests/IdentityUserClaimTests.cs

@@ -0,0 +1,32 @@
+namespace Tests
+{
+	using System.Security.Claims;
+	using AspNet.Identity.MongoDB;
+	using NUnit.Framework;
+
+	[TestFixture]
+	public class IdentityUserClaimTests : AssertionHelper
+	{
+		[Test]
+		public void Create_FromClaim_SetsTypeAndValue()
+		{
+			var claim = new Claim("type", "value");
+
+			var userClaim = new IdentityUserClaim(claim);
+
+			Expect(userClaim.Type, Is.EqualTo("type"));
+			Expect(userClaim.Value, Is.EqualTo("value"));
+		}
+
+		[Test]
+		public void ToSecurityClaim_SetsTypeAndValue()
+		{
+			var userClaim = new IdentityUserClaim {Type = "type", Value = "value"};
+
+			var claim = userClaim.ToSecurityClaim();
+
+			Expect(claim.Type, Is.EqualTo("type"));
+			Expect(claim.Value, Is.EqualTo("value"));
+		}
+	}
+}

src/Tests/IdentityUserTests.cs

@@ -107,5 +107,25 @@ public void SetConfirmed_AlreadyConfirmed_DoesNotUpdateConfirmedAt()
 			var after = DateTime.UtcNow;
 			Expect(user.ConfirmedAtUtc, Is.Not.InRange(before, after));
 		}
+
+		[Test]
+		public void Create_NewIdentityUser_ClaimsNotNull()
+		{
+			var user = new IdentityUser();
+
+			Expect(user.Claims, Is.Not.Null);
+		}
+
+		[Test]
+		public void Create_NullClaims_DoesNotSerializeClaims()
+		{
+			// serialized nulls can cause havoc in deserialization, overwriting the constructor's initial empty list 
+			var user = new IdentityUser();
+			user.Claims = null;
+
+			var document = user.ToBsonDocument();
+
+			Expect(document.Contains("Claims"), Is.False);
+		}
 	}
 }

src/Tests/Tests.csproj

@@ -56,6 +56,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IdentityUserClaimTests.cs" />
     <Compile Include="IdentityUserTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ObjectIdHelpers.cs" />