Browse Source

Use standard name as abp claim type.

pull/5315/head
maliming 6 years ago
parent
commit
9b44c00c1a
  1. 54
      framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs
  2. 2
      framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs

54
framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs

@ -8,71 +8,69 @@ namespace Volo.Abp.Security.Claims
/// </summary> /// </summary>
public static class AbpClaimTypes public static class AbpClaimTypes
{ {
public const string ClaimTypeNamespace = "abp_";
/// <summary> /// <summary>
/// Default: abp_username /// Default: <see cref="ClaimTypes.Name"/>
/// </summary> /// </summary>
public static string UserName { get; set; } = ClaimTypeNamespace + "username"; public static string UserName { get; set; } = ClaimTypes.Name;
/// <summary> /// <summary>
/// Default: abp_name /// Default: <see cref="ClaimTypes.GivenName"/>
/// </summary> /// </summary>
public static string Name { get; set; } = ClaimTypeNamespace + "name"; public static string Name { get; set; } = ClaimTypes.GivenName;
/// <summary> /// <summary>
/// Default: abp_surname /// Default: <see cref="ClaimTypes.Surname"/>
/// </summary> /// </summary>
public static string SurName { get; set; } = ClaimTypeNamespace + "surname"; public static string SurName { get; set; } = ClaimTypes.Surname;
/// <summary> /// <summary>
/// Default: abp_user_id /// Default: security_stamp
/// </summary> /// </summary>
public static string UserId { get; set; } = ClaimTypeNamespace + "user_id"; public static string SecurityStamp { get; set; } = "security_stamp";
/// <summary> /// <summary>
/// Default: abp_role /// Default: <see cref="ClaimTypes.NameIdentifier"/>
/// </summary> /// </summary>
public static string Role { get; set; } = ClaimTypeNamespace + "role"; public static string UserId { get; set; } = ClaimTypes.NameIdentifier;
/// <summary> /// <summary>
/// Default: abp_security_stamp /// Default: <see cref="ClaimTypes.Role"/>
/// </summary> /// </summary>
public static string SecurityStamp { get; set; } = ClaimTypeNamespace + "security_stamp"; public static string Role { get; set; } = ClaimTypes.Role;
/// <summary> /// <summary>
/// Default: abp_email /// Default: <see cref="ClaimTypes.Email"/>
/// </summary> /// </summary>
public static string Email { get; set; } = ClaimTypeNamespace + "email"; public static string Email { get; set; } = ClaimTypes.Email;
/// <summary> /// <summary>
/// Default: abp_email_verified /// Default: "email_verified".
/// </summary> /// </summary>
public static string EmailVerified { get; set; } = ClaimTypeNamespace + "email_verified"; public static string EmailVerified { get; set; } = "email_verified";
/// <summary> /// <summary>
/// Default: abp_phone_number /// Default: "phone_number".
/// </summary> /// </summary>
public static string PhoneNumber { get; set; } = ClaimTypeNamespace + "phone_number"; public static string PhoneNumber { get; set; } = "phone_number";
/// <summary> /// <summary>
/// Default: abp_phone_number_verified /// Default: "phone_number_verified".
/// </summary> /// </summary>
public static string PhoneNumberVerified { get; set; } = ClaimTypeNamespace + "phone_number_verified"; public static string PhoneNumberVerified { get; set; } = "phone_number_verified";
/// <summary> /// <summary>
/// Default: abp_tenant_id /// Default: "tenantid".
/// </summary> /// </summary>
public static string TenantId { get; set; } = ClaimTypeNamespace + "tenant_id"; public static string TenantId { get; set; } = "tenant_id";
/// <summary> /// <summary>
/// Default: abp_edition_id /// Default: "editionid".
/// </summary> /// </summary>
public static string EditionId { get; set; } = ClaimTypeNamespace + "edition_id"; public static string EditionId { get; set; } = "edition_id";
/// <summary> /// <summary>
/// Default: abp_client_id /// Default: "client_id".
/// </summary> /// </summary>
public static string ClientId { get; set; } = ClaimTypeNamespace + "client_id"; public static string ClientId { get; set; } = "client_id";
} }
} }

2
framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs

@ -23,7 +23,7 @@ namespace Volo.Abp.Authorization
new Claim(AbpClaimTypes.Role, "MyRole") 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 claimsPrincipal = new ClaimsPrincipal(identity);
var principalAccessor = Substitute.For<ICurrentPrincipalAccessor>(); var principalAccessor = Substitute.For<ICurrentPrincipalAccessor>();
principalAccessor.Principal.Returns(ci => claimsPrincipal); principalAccessor.Principal.Returns(ci => claimsPrincipal);

Loading…
Cancel
Save