Browse Source
Merge pull request #4279 from abpframework/maliming/ThreadCurrentPrincipalAccessor
Make GetClaimsPrincipal mehtod public.
pull/4290/head
Halil İbrahim Kalkan
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
5 additions and
5 deletions
-
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/Claims/HttpContextCurrentPrincipalAccessor.cs
-
framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
-
modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Security/FakeCurrentPrincipalAccessor.cs
-
templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs
-
templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs
|
|
|
@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Security.Claims |
|
|
|
_httpContextAccessor = httpContextAccessor; |
|
|
|
} |
|
|
|
|
|
|
|
public override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
protected override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
{ |
|
|
|
return _httpContextAccessor.HttpContext?.User ?? base.GetClaimsPrincipal(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -11,7 +11,7 @@ namespace Volo.Abp.Security.Claims |
|
|
|
|
|
|
|
private readonly AsyncLocal<ClaimsPrincipal> _currentPrincipal = new AsyncLocal<ClaimsPrincipal>(); |
|
|
|
|
|
|
|
public virtual ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
protected virtual ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
{ |
|
|
|
return Thread.CurrentPrincipal as ClaimsPrincipal; |
|
|
|
} |
|
|
|
|
|
|
|
@ -8,7 +8,7 @@ namespace Volo.Abp.BlobStoring.Database.Security |
|
|
|
[Dependency(ReplaceServices = true)] |
|
|
|
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor |
|
|
|
{ |
|
|
|
public override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
protected override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
{ |
|
|
|
return GetPrincipal(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.Security |
|
|
|
[Dependency(ReplaceServices = true)] |
|
|
|
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor |
|
|
|
{ |
|
|
|
public override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
protected override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
{ |
|
|
|
return GetPrincipal(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.Security |
|
|
|
[Dependency(ReplaceServices = true)] |
|
|
|
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor |
|
|
|
{ |
|
|
|
public override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
protected override ClaimsPrincipal GetClaimsPrincipal() |
|
|
|
{ |
|
|
|
return GetPrincipal(); |
|
|
|
} |
|
|
|
|