Browse Source

Make GetClaimsPrincipal mehtod public.

pull/3918/head
maliming 6 years ago
parent
commit
5a2b36eeb4
  1. 2
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/Claims/HttpContextCurrentPrincipalAccessor.cs
  2. 2
      framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
  3. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakeAuthenticationMiddleware.cs
  4. 2
      templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  5. 2
      templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs

2
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/Claims/HttpContextCurrentPrincipalAccessor.cs

@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Security.Claims
_httpContextAccessor = httpContextAccessor; _httpContextAccessor = httpContextAccessor;
} }
protected override ClaimsPrincipal GetClaimsPrincipal() public override ClaimsPrincipal GetClaimsPrincipal()
{ {
return _httpContextAccessor.HttpContext?.User ?? base.GetClaimsPrincipal(); return _httpContextAccessor.HttpContext?.User ?? base.GetClaimsPrincipal();
} }

2
framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.Security.Claims
private readonly AsyncLocal<ClaimsPrincipal> _currentPrincipal = new AsyncLocal<ClaimsPrincipal>(); private readonly AsyncLocal<ClaimsPrincipal> _currentPrincipal = new AsyncLocal<ClaimsPrincipal>();
protected virtual ClaimsPrincipal GetClaimsPrincipal() public virtual ClaimsPrincipal GetClaimsPrincipal()
{ {
return Thread.CurrentPrincipal as ClaimsPrincipal; return Thread.CurrentPrincipal as ClaimsPrincipal;
} }

2
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakeAuthenticationMiddleware.cs

@ -27,8 +27,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Authorization
{ {
new ClaimsIdentity(_fakeUserClaims.Claims, "FakeSchema") new ClaimsIdentity(_fakeUserClaims.Claims, "FakeSchema")
}); });
//_currentPrincipalAccessor.Change(context.User);
} }
await next(context); await next(context);

2
templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
protected override ClaimsPrincipal GetClaimsPrincipal() public override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

2
templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
protected override ClaimsPrincipal GetClaimsPrincipal() public override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

Loading…
Cancel
Save