From c0789c263c26f408fd1a2b97b1508826f2c020fc Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Wed, 9 Sep 2020 20:09:31 +0800
Subject: [PATCH] Revert renaming claim name.

---
 .../Volo/Abp/Security/Claims/AbpClaimTypes.cs       | 13 ++++---------
 .../Volo/Abp/Identity/AbpIdentityDomainModule.cs    |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs
index 6d6672ec2b..271d5d3d94 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs
@@ -23,11 +23,6 @@ namespace Volo.Abp.Security.Claims
         /// </summary>
         public static string SurName { get; set; } = ClaimTypes.Surname;
 
-        /// <summary>
-        /// Default: security_stamp
-        /// </summary>
-        public static string SecurityStamp { get; set; } =  "security_stamp";
-
         /// <summary>
         /// Default: <see cref="ClaimTypes.NameIdentifier"/>
         /// </summary>
@@ -59,14 +54,14 @@ namespace Volo.Abp.Security.Claims
         public static string PhoneNumberVerified { get; set; } = "phone_number_verified";
 
         /// <summary>
-        /// Default: "tenant_id".
+        /// Default: "tenantid".
         /// </summary>
-        public static string TenantId { get; set; } = "tenant_id";
+        public static string TenantId { get; set; } = "tenantid";
 
         /// <summary>
-        /// Default: "edition_id".
+        /// Default: "editionid".
         /// </summary>
-        public static string EditionId { get; set; } = "edition_id";
+        public static string EditionId { get; set; } = "editionid";
 
         /// <summary>
         /// Default: "client_id".
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index 685f66a9ea..6feddd125b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -51,7 +51,6 @@ namespace Volo.Abp.Identity
                 options.ClaimsIdentity.UserIdClaimType = AbpClaimTypes.UserId;
                 options.ClaimsIdentity.UserNameClaimType = AbpClaimTypes.UserName;
                 options.ClaimsIdentity.RoleClaimType = AbpClaimTypes.Role;
-                options.ClaimsIdentity.SecurityStampClaimType = AbpClaimTypes.SecurityStamp;
             });
 
             AddAbpIdentityOptionsFactory(context.Services);