From 2fe50a543eb8d0262d8394a3d17acdf045a10525 Mon Sep 17 00:00:00 2001 From: IAtsuta Date: Fri, 20 Oct 2023 17:04:14 +0200 Subject: [PATCH] fix ActualPrincipalSource --- .../ActualPrincipalSource.cs | 7 ++++--- src/__SolutionItems/CommonAssemblyInfo.cs | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/_Authorization/Framework.Authorization.SecuritySystem/ActualPrincipalSource.cs b/src/_Authorization/Framework.Authorization.SecuritySystem/ActualPrincipalSource.cs index c3f6c1cfe..f0e84b87d 100644 --- a/src/_Authorization/Framework.Authorization.SecuritySystem/ActualPrincipalSource.cs +++ b/src/_Authorization/Framework.Authorization.SecuritySystem/ActualPrincipalSource.cs @@ -1,15 +1,16 @@ using Framework.Authorization.Domain; +using Framework.Core; namespace Framework.Authorization.SecuritySystem; public class ActualPrincipalSource : IActualPrincipalSource { - private readonly Principal currentPrincipal; + private readonly ICurrentPrincipalSource currentPrincipalSource; public ActualPrincipalSource(ICurrentPrincipalSource currentPrincipalSource) { - this.currentPrincipal = currentPrincipalSource.CurrentPrincipal; + this.currentPrincipalSource = currentPrincipalSource; } - public Principal ActualPrincipal => this.currentPrincipal.RunAs ?? this.currentPrincipal; + public Principal ActualPrincipal => this.currentPrincipalSource.CurrentPrincipal.Pipe(v => v.RunAs ?? v); } diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs index 4bc78fd0a..be2f15071 100644 --- a/src/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/__SolutionItems/CommonAssemblyInfo.cs @@ -4,9 +4,9 @@ [assembly: AssemblyCompany("Luxoft")] [assembly: AssemblyCopyright("Copyright © Luxoft 2009-2023")] -[assembly: AssemblyVersion("19.1.6.0")] -[assembly: AssemblyFileVersion("19.1.6.0")] -[assembly: AssemblyInformationalVersion("19.1.6.0")] +[assembly: AssemblyVersion("19.1.7.0")] +[assembly: AssemblyFileVersion("19.1.7.0")] +[assembly: AssemblyInformationalVersion("19.1.7.0")] #if DEBUG [assembly: AssemblyConfiguration("Debug")]