From eb53b1d464430746002bd34f722f4a677db69e92 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 18 Aug 2022 10:00:12 +0800
Subject: [PATCH] Fix ConcurrencyStamp consistency issue for IdentityRole and
 IdentityUser.

---
 .../Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs  | 2 +-
 .../Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs  | 2 +-
 .../Volo/Abp/Identity/IdentityUserStore_Tests.cs                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
index ce6c7d7049..0e86e4e526 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
@@ -62,7 +62,7 @@ public class IdentityRole : AggregateRoot<Guid>, IMultiTenant
         Name = name;
         TenantId = tenantId;
         NormalizedName = name.ToUpperInvariant();
-        ConcurrencyStamp = Guid.NewGuid().ToString();
+        ConcurrencyStamp = Guid.NewGuid().ToString("N");
 
         Claims = new Collection<IdentityRoleClaim>();
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
index 834f0d8d7a..eec620395c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
@@ -158,7 +158,7 @@ public class IdentityUser : FullAuditedAggregateRoot<Guid>, IUser
         NormalizedUserName = userName.ToUpperInvariant();
         Email = email;
         NormalizedEmail = email.ToUpperInvariant();
-        ConcurrencyStamp = Guid.NewGuid().ToString();
+        ConcurrencyStamp = Guid.NewGuid().ToString("N");
         SecurityStamp = Guid.NewGuid().ToString();
         IsActive = true;
 
diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserStore_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserStore_Tests.cs
index 8b08732378..65c3ff5a39 100644
--- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserStore_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserStore_Tests.cs
@@ -112,7 +112,7 @@ public class IdentityUserStore_Tests : AbpIdentityDomainTestBase
 
         (await _identityUserStore.UpdateAsync(user)).Succeeded.ShouldBeTrue();
 
-        user.ConcurrencyStamp = Guid.NewGuid().ToString();
+        user.ConcurrencyStamp = Guid.NewGuid().ToString("N");
         var identityResult = await _identityUserStore.UpdateAsync(user);
 
         identityResult.Succeeded.ShouldBeFalse();