From 9b44c00c1afd16b1499fa3d196858416bbc5987f Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Tue, 8 Sep 2020 21:27:58 +0800
Subject: [PATCH] Use standard name as abp claim type.

---
 .../Volo/Abp/Security/Claims/AbpClaimTypes.cs | 54 +++++++++----------
 .../Authorization/AuthorizationTestBase.cs    |  2 +-
 2 files changed, 27 insertions(+), 29 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 a797b360ee..e829ecddf3 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
@@ -8,71 +8,69 @@ namespace Volo.Abp.Security.Claims
     /// </summary>
     public static class AbpClaimTypes
     {
-        public const string ClaimTypeNamespace = "abp_";
-
         /// <summary>
-        /// Default: abp_username
+        /// Default: <see cref="ClaimTypes.Name"/>
         /// </summary>
-        public static string UserName { get; set; } = ClaimTypeNamespace + "username";
+        public static string UserName { get; set; } = ClaimTypes.Name;
 
         /// <summary>
-        /// Default: abp_name
+        /// Default: <see cref="ClaimTypes.GivenName"/>
         /// </summary>
-        public static string Name { get; set; } = ClaimTypeNamespace + "name";
+        public static string Name { get; set; } = ClaimTypes.GivenName;
 
         /// <summary>
-        /// Default: abp_surname
+        /// Default: <see cref="ClaimTypes.Surname"/>
         /// </summary>
-        public static string SurName { get; set; } = ClaimTypeNamespace + "surname";
+        public static string SurName { get; set; } = ClaimTypes.Surname;
 
         /// <summary>
-        /// Default: abp_user_id
+        /// Default: security_stamp
         /// </summary>
-        public static string UserId { get; set; } = ClaimTypeNamespace + "user_id";
+        public static string SecurityStamp { get; set; } =  "security_stamp";
 
         /// <summary>
-        /// Default: abp_role
+        /// Default: <see cref="ClaimTypes.NameIdentifier"/>
         /// </summary>
-        public static string Role { get; set; } = ClaimTypeNamespace + "role";
+        public static string UserId { get; set; } = ClaimTypes.NameIdentifier;
 
         /// <summary>
-        /// Default: abp_security_stamp
+        /// Default: <see cref="ClaimTypes.Role"/>
         /// </summary>
-        public static string SecurityStamp { get; set; } =  ClaimTypeNamespace + "security_stamp";
+        public static string Role { get; set; } = ClaimTypes.Role;
 
         /// <summary>
-        /// Default: abp_email
+        /// Default: <see cref="ClaimTypes.Email"/>
         /// </summary>
-        public static string Email { get; set; } = ClaimTypeNamespace + "email";
+        public static string Email { get; set; } = ClaimTypes.Email;
 
         /// <summary>
-        /// Default: abp_email_verified
+        /// Default: "email_verified".
         /// </summary>
-        public static string EmailVerified { get; set; } = ClaimTypeNamespace + "email_verified";
+        public static string EmailVerified { get; set; } = "email_verified";
 
         /// <summary>
-        /// Default: abp_phone_number
+        /// Default: "phone_number".
         /// </summary>
-        public static string PhoneNumber { get; set; } = ClaimTypeNamespace + "phone_number";
+        public static string PhoneNumber { get; set; } = "phone_number";
 
         /// <summary>
-        /// Default: abp_phone_number_verified
+        /// Default: "phone_number_verified".
         /// </summary>
-        public static string PhoneNumberVerified { get; set; } = ClaimTypeNamespace + "phone_number_verified";
+        public static string PhoneNumberVerified { get; set; } = "phone_number_verified";
 
         /// <summary>
-        /// Default: abp_tenant_id
+        /// Default: "tenantid".
         /// </summary>
-        public static string TenantId { get; set; } = ClaimTypeNamespace + "tenant_id";
+        public static string TenantId { get; set; } = "tenant_id";
 
         /// <summary>
-        /// Default: abp_edition_id
+        /// Default: "editionid".
         /// </summary>
-        public static string EditionId { get; set; } = ClaimTypeNamespace + "edition_id";
+        public static string EditionId { get; set; } = "edition_id";
 
         /// <summary>
-        /// Default: abp_client_id
+        /// Default: "client_id".
         /// </summary>
-        public static string ClientId { get; set; } = ClaimTypeNamespace + "client_id";
+        public static string ClientId { get; set; } = "client_id";
     }
 }
diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
index 89f45600f4..5cf9976e46 100644
--- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
+++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
@@ -23,7 +23,7 @@ namespace Volo.Abp.Authorization
                                 new Claim(AbpClaimTypes.Role, "MyRole")
                             };
 
-            var identity = new ClaimsIdentity(claims,null, AbpClaimTypes.UserName, AbpClaimTypes.Role);
+            var identity = new ClaimsIdentity(claims);
             var claimsPrincipal = new ClaimsPrincipal(identity);
             var principalAccessor = Substitute.For<ICurrentPrincipalAccessor>();
             principalAccessor.Principal.Returns(ci => claimsPrincipal);