Merge pull request #31 from alexandre-spieser/alex/release/2.1.1

Alex/release/2.1.1

sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj

@@ -8,7 +8,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.Identity.MongoDbCore" Version="2.1.0" />
+    <PackageReference Include="AspNetCore.Identity.MongoDbCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.0-beta1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />

src/AspNetCore.Identity.MongoDbCore.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.1" />
     <PackageReference Include="MongoDB.Driver" Version="2.9.3" />
-    <PackageReference Include="MongoDbGenericRepository" Version="1.4.1" />
+    <PackageReference Include="MongoDbGenericRepository" Version="1.4.3" />
   </ItemGroup>
 
   <ItemGroup>

src/AspNetCore.Identity.MongoDbCore.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AspNetCore.Identity.MongoDbCore</id>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <title>AspNetCore.Identity.MongoDbCore</title>
     <authors>Alexandre Spieser</authors>
     <owners>Alexandre Spieser</owners>
@@ -24,7 +24,7 @@
           <dependency id="Microsoft.AspNetCore.Identity" version="2.2" />
           <dependency id="Microsoft.Extensions.Identity.Stores" version="3.1.1" />
           <dependency id="MongoDB.Driver" version="2.9.3" />
-          <dependency id="MongoDbGenericRepository" version="1.4.1" />
+          <dependency id="MongoDbGenericRepository" version="1.4.3" />
         </group>
 	</dependencies>
   </metadata>

src/Models/MongoIdentityRole.cs

@@ -1,5 +1,4 @@
-using AspNetCore.Identity.MongoDbCore.Extensions;
+using AspNetCore.Identity.MongoDbCore.Interfaces;
-using AspNetCore.Identity.MongoDbCore.Interfaces;
 using Microsoft.AspNetCore.Identity;
 using MongoDbGenericRepository.Models;
 using MongoDbGenericRepository.Utils;

src/Models/MongoIdentityUser.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using MongoDbGenericRepository.Models;
-using System.Linq;
-using MongoDB.Driver;
 using AspNetCore.Identity.MongoDbCore.Interfaces;
 using Microsoft.AspNetCore.Identity;
-using AspNetCore.Identity.MongoDbCore.Extensions;
+using MongoDB.Driver;
+using MongoDbGenericRepository.Models;
 using MongoDbGenericRepository.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace AspNetCore.Identity.MongoDbCore.Models
 {
@@ -157,7 +156,7 @@ namespace AspNetCore.Identity.MongoDbCore.Models
         /// <returns></returns>
         public virtual MongoIdentityUser<TKey> SetVersion(int version)
         {
-            Version = 1;
+            Version = version;
             return this;
         }
 

src/lib/netcoreapp3.1/AspNetCore.Identity.MongoDbCore.deps.json

@@ -11,7 +11,7 @@
           "Microsoft.AspNetCore.Identity": "2.2.0",
           "Microsoft.Extensions.Identity.Stores": "3.1.1",
           "MongoDB.Driver": "2.9.3",
-          "MongoDbGenericRepository": "1.4.1"
+          "MongoDbGenericRepository": "1.4.3"
         },
         "runtime": {
           "AspNetCore.Identity.MongoDbCore.dll": {}
@@ -487,7 +487,7 @@
           }
         }
       },
-      "MongoDbGenericRepository/1.4.1": {
+      "MongoDbGenericRepository/1.4.3": {
         "dependencies": {
           "MongoDB.Driver": "2.9.3"
         },
@@ -1741,12 +1741,12 @@
       "path": "mongodb.driver.core/2.9.3",
       "hashPath": "mongodb.driver.core.2.9.3.nupkg.sha512"
     },
-    "MongoDbGenericRepository/1.4.1": {
+    "MongoDbGenericRepository/1.4.3": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-TbRnmktTly5L/tZZxTqf6DC4HUHe9G1HVCzvsw0G07kRx2E6VKXGEKbCvG6rKZxqNv5/CcTS81xYST0P/GsCTg==",
+      "sha512": "sha512-SLJp2QnPzhYHUDyBXFekrLwaHWTqwHcCErm9LQlXOQq6VYU1sF5bSmAoQ7Ak0BPD8YTqVbTQc6wbSD8EJYMyAQ==",
-      "path": "mongodbgenericrepository/1.4.1",
+      "path": "mongodbgenericrepository/1.4.3",
-      "hashPath": "mongodbgenericrepository.1.4.1.nupkg.sha512"
+      "hashPath": "mongodbgenericrepository.1.4.3.nupkg.sha512"
     },
     "NETStandard.Library/1.6.1": {
       "type": "package",

src/lib/netstandard2.1/AspNetCore.Identity.MongoDbCore.deps.json

@@ -12,7 +12,7 @@
           "Microsoft.AspNetCore.Identity": "2.2.0",
           "Microsoft.Extensions.Identity.Stores": "3.1.1",
           "MongoDB.Driver": "2.9.3",
-          "MongoDbGenericRepository": "1.4.1"
+          "MongoDbGenericRepository": "1.4.3"
         },
         "runtime": {
           "AspNetCore.Identity.MongoDbCore.dll": {}
@@ -501,7 +501,7 @@
           }
         }
       },
-      "MongoDbGenericRepository/1.4.1": {
+      "MongoDbGenericRepository/1.4.3": {
         "dependencies": {
           "MongoDB.Driver": "2.9.3"
         },
@@ -2034,12 +2034,12 @@
       "path": "mongodb.driver.core/2.9.3",
       "hashPath": "mongodb.driver.core.2.9.3.nupkg.sha512"
     },
-    "MongoDbGenericRepository/1.4.1": {
+    "MongoDbGenericRepository/1.4.3": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-TbRnmktTly5L/tZZxTqf6DC4HUHe9G1HVCzvsw0G07kRx2E6VKXGEKbCvG6rKZxqNv5/CcTS81xYST0P/GsCTg==",
+      "sha512": "sha512-SLJp2QnPzhYHUDyBXFekrLwaHWTqwHcCErm9LQlXOQq6VYU1sF5bSmAoQ7Ak0BPD8YTqVbTQc6wbSD8EJYMyAQ==",
-      "path": "mongodbgenericrepository/1.4.1",
+      "path": "mongodbgenericrepository/1.4.3",
-      "hashPath": "mongodbgenericrepository.1.4.1.nupkg.sha512"
+      "hashPath": "mongodbgenericrepository.1.4.3.nupkg.sha512"
     },
     "NETStandard.Library/1.6.1": {
       "type": "package",

test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.Identity.MongoDbCore" Version="2.1.0" />
+    <PackageReference Include="AspNetCore.Identity.MongoDbCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.10.1" />
-    <PackageReference Include="MongoDbGenericRepository" Version="1.4.1" />
+    <PackageReference Include="MongoDbGenericRepository" Version="1.4.3" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/UserStoreTest.cs

@@ -303,6 +303,44 @@ namespace AspNetCore.Identity.MongoDbCore.Test
             IdentityResultAssert.IsFailure(await manager2.DeleteAsync(role2), new IdentityErrorDescriber().ConcurrencyFailure());
         }
 
+        [Fact]
+        public async Task CorrectlyUpdatesUser()
+        {
+            // Arrange
+            const string originalEmail = "original@email.com";
+            const string newEmail1 = "new1@email.com";
+            const string newEmail2 = "new2@email.com";
+            var user = CreateTestUser();
+            user.Email = originalEmail;
+            var manager = CreateManager();
+            IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
+            var userToUpdate = await manager.FindByIdAsync(user.Id);
+            Assert.NotNull(user);
+            Assert.Equal(originalEmail, userToUpdate.Email);
+
+            // Act & Assert
+            // change the email to the new value newEmail1
+            userToUpdate.Email = newEmail1;
+            userToUpdate.UserName = newEmail1;
+            var updateResult1 = await manager.UpdateAsync(userToUpdate);
+            Assert.True(updateResult1.Succeeded);
+            var updatedUser1 = await manager.FindByIdAsync(user.Id);
+            Assert.NotNull(updatedUser1);
+            Assert.Equal(newEmail1, updatedUser1.Email);
+            Assert.Equal(newEmail1, updatedUser1.UserName);
+
+            // change the email to the new value newEmail2
+            userToUpdate.Email = newEmail2;
+            userToUpdate.UserName = newEmail2;
+            var updateResult2 = await manager.UpdateAsync(userToUpdate);
+            Assert.True(updateResult2.Succeeded);
+
+            var updatedUser2 = await manager.FindByIdAsync(user.Id);
+            Assert.NotNull(updatedUser2);
+            Assert.Equal(newEmail2, updatedUser2.Email);
+            Assert.Equal(newEmail2, updatedUser2.UserName);
+        }
+
         protected override MongoDbIdentityUser CreateTestUser(string namePrefix = "", string email = "", string phoneNumber = "",
             bool lockoutEnabled = false, DateTimeOffset? lockoutEnd = default(DateTimeOffset?), bool useNamePrefixAsUserName = false)
         {