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
///
public static class AbpClaimTypes
{
- public const string ClaimTypeNamespace = "abp_";
-
///
- /// Default: abp_username
+ /// Default:
///
- public static string UserName { get; set; } = ClaimTypeNamespace + "username";
+ public static string UserName { get; set; } = ClaimTypes.Name;
///
- /// Default: abp_name
+ /// Default:
///
- public static string Name { get; set; } = ClaimTypeNamespace + "name";
+ public static string Name { get; set; } = ClaimTypes.GivenName;
///
- /// Default: abp_surname
+ /// Default:
///
- public static string SurName { get; set; } = ClaimTypeNamespace + "surname";
+ public static string SurName { get; set; } = ClaimTypes.Surname;
///
- /// Default: abp_user_id
+ /// Default: security_stamp
///
- public static string UserId { get; set; } = ClaimTypeNamespace + "user_id";
+ public static string SecurityStamp { get; set; } = "security_stamp";
///
- /// Default: abp_role
+ /// Default:
///
- public static string Role { get; set; } = ClaimTypeNamespace + "role";
+ public static string UserId { get; set; } = ClaimTypes.NameIdentifier;
///
- /// Default: abp_security_stamp
+ /// Default:
///
- public static string SecurityStamp { get; set; } = ClaimTypeNamespace + "security_stamp";
+ public static string Role { get; set; } = ClaimTypes.Role;
///
- /// Default: abp_email
+ /// Default:
///
- public static string Email { get; set; } = ClaimTypeNamespace + "email";
+ public static string Email { get; set; } = ClaimTypes.Email;
///
- /// Default: abp_email_verified
+ /// Default: "email_verified".
///
- public static string EmailVerified { get; set; } = ClaimTypeNamespace + "email_verified";
+ public static string EmailVerified { get; set; } = "email_verified";
///
- /// Default: abp_phone_number
+ /// Default: "phone_number".
///
- public static string PhoneNumber { get; set; } = ClaimTypeNamespace + "phone_number";
+ public static string PhoneNumber { get; set; } = "phone_number";
///
- /// Default: abp_phone_number_verified
+ /// Default: "phone_number_verified".
///
- public static string PhoneNumberVerified { get; set; } = ClaimTypeNamespace + "phone_number_verified";
+ public static string PhoneNumberVerified { get; set; } = "phone_number_verified";
///
- /// Default: abp_tenant_id
+ /// Default: "tenantid".
///
- public static string TenantId { get; set; } = ClaimTypeNamespace + "tenant_id";
+ public static string TenantId { get; set; } = "tenant_id";
///
- /// Default: abp_edition_id
+ /// Default: "editionid".
///
- public static string EditionId { get; set; } = ClaimTypeNamespace + "edition_id";
+ public static string EditionId { get; set; } = "edition_id";
///
- /// Default: abp_client_id
+ /// Default: "client_id".
///
- 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();
principalAccessor.Principal.Returns(ci => claimsPrincipal);