Support for current user identity

EasyMicroservices · Dec 27, 2023 · 3ebfc6d · 3ebfc6d
1 parent a4fbcdb
commit 3ebfc6d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/EasyMicroservices.Cores.AspCoreApi.csproj b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/EasyMicroservices.Cores.AspCoreApi.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>asp core servces.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,services,asp,aspnet</PackageTags>

diff --git a/....Cores.AspEntityFrameworkCoreApi/EasyMicroservices.Cores.AspEntityFrameworkCoreApi.csproj b/....Cores.AspEntityFrameworkCoreApi/EasyMicroservices.Cores.AspEntityFrameworkCoreApi.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>asp core servces.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,services,asp,aspnet,aspcore,efcore</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.Clients/EasyMicroservices.Cores.Clients.csproj b/src/CSharp/EasyMicroservices.Cores.Clients/EasyMicroservices.Cores.Clients.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,client,clients</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.Contracts/EasyMicroservices.Cores.Contracts.csproj b/src/CSharp/EasyMicroservices.Cores.Contracts/EasyMicroservices.Cores.Contracts.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>core contracts.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,contract,contracts,dto,dtos</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Interfaces/IUniqueIdentityManager.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Interfaces/IUniqueIdentityManager.cs
@@ -1,8 +1,5 @@
-using EasyMicroservices.Cores.Interfaces;
-using EasyMicroservices.Cores.Models;
-using EasyMicroservices.Database.Interfaces;
+using EasyMicroservices.Database.Interfaces;
 using System;
-using System.Threading.Tasks;
 
 namespace EasyMicroservices.Cores.Database.Interfaces
 {
@@ -15,10 +12,11 @@ public interface IUniqueIdentityManager
         /// update unique identity
         /// </summary>
         /// <typeparam name="TEntity"></typeparam>
+        /// <param name="currentUserUniqueIdentity"></param>
         /// <param name="context"></param>
         /// <param name="entity"></param>
         /// <returns>is need update database</returns>
-        bool UpdateUniqueIdentity<TEntity>(IContext context, TEntity entity);
+        bool UpdateUniqueIdentity<TEntity>(string currentUserUniqueIdentity, IContext context, TEntity entity);
         /// <summary>
         /// 
         /// </summary>

diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Logics/DatabaseLogicInfrastructure.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Logics/DatabaseLogicInfrastructure.cs
@@ -9,7 +9,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -62,6 +61,8 @@ private async Task<IEasyReadableQueryableAsync<TEntity>> UniqueIdentityQueryMake
         {
             if (!typeof(IUniqueIdentitySchema).IsAssignableFrom(typeof(TEntity)))
                 return easyReadableQueryable;
+            if (uniqueIdentity.IsNullOrEmpty())
+                uniqueIdentity = await _baseUnitOfWork.GetCurrentUserUniqueIdentity();
             var uniqueIdentityManager = await GetIUniqueIdentityManager();
             IEasyReadableQueryableAsync<TEntity> queryable = easyReadableQueryable;
             if (!uniqueIdentityManager.IsUniqueIdentityForThisTable<TEntity>(easyReadableQueryable.Context, uniqueIdentity))
@@ -799,8 +800,9 @@ public async Task<MessageContract<TEntity>> Add<TEntity>(IEasyWritableQueryableA
             await easyWritableQueryable.SaveChangesAsync();
             if (typeof(IUniqueIdentitySchema).IsAssignableFrom(typeof(TEntity)))
             {
+                var currentUserUniqueIdentity = await _baseUnitOfWork.GetCurrentUserUniqueIdentity();
                 var uniqueIdentityManager = await GetIUniqueIdentityManager();
-                if (uniqueIdentityManager.UpdateUniqueIdentity(easyWritableQueryable.Context, result.Entity))
+                if (uniqueIdentityManager.UpdateUniqueIdentity(currentUserUniqueIdentity, easyWritableQueryable.Context, result.Entity))
                 {
                     await InternalUpdate(easyWritableQueryable, result.Entity, false, true, true, cancellationToken);
                     await easyWritableQueryable.SaveChangesAsync();
@@ -835,10 +837,11 @@ public async Task<ListMessageContract<TEntity>> AddBulk<TEntity>(IEasyWritableQu
             bool anyUpdate = false;
             if (typeof(IUniqueIdentitySchema).IsAssignableFrom(typeof(TEntity)))
             {
+                var currentUserUniqueIdentity = await _baseUnitOfWork.GetCurrentUserUniqueIdentity();
                 var uniqueIdentityManager = await GetIUniqueIdentityManager();
                 foreach (var item in result)
                 {
-                    if (uniqueIdentityManager.UpdateUniqueIdentity(easyWritableQueryable.Context, item.Entity))
+                    if (uniqueIdentityManager.UpdateUniqueIdentity(currentUserUniqueIdentity, easyWritableQueryable.Context, item.Entity))
                     {
                         anyUpdate = true;
                     }

diff --git a/...CSharp/EasyMicroservices.Cores.Database/Database/Managers/DefaultUniqueIdentityManager.cs b/...CSharp/EasyMicroservices.Cores.Database/Database/Managers/DefaultUniqueIdentityManager.cs
@@ -29,14 +29,17 @@ public DefaultUniqueIdentityManager(WhiteLabelInfo whiteLabelInfo)
         /// 
         /// </summary>
         /// <typeparam name="TEntity"></typeparam>
+        /// <param name="currentUserUniqueIdentity"></param>
         /// <param name="context"></param>
         /// <param name="entity"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public bool UpdateUniqueIdentity<TEntity>(IContext context, TEntity entity)
+        public bool UpdateUniqueIdentity<TEntity>(string currentUserUniqueIdentity, IContext context, TEntity entity)
         {
             if (entity is IUniqueIdentitySchema uniqueIdentitySchema)
             {
+                if (uniqueIdentitySchema.UniqueIdentity.IsNullOrEmpty())
+                    uniqueIdentitySchema.UniqueIdentity = currentUserUniqueIdentity;
                 if (uniqueIdentitySchema.UniqueIdentity.IsNullOrEmpty())
                     uniqueIdentitySchema.UniqueIdentity = _whiteLabelInfo.StartUniqueIdentity;
                 var ids = uniqueIdentitySchema.UniqueIdentity.IsNullOrEmpty() ? null : DecodeUniqueIdentity(uniqueIdentitySchema.UniqueIdentity);

diff --git a/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj b/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database</PackageTags>

diff --git a/...icroservices.Cores.EntityFrameworkCore/EasyMicroservices.Cores.EntityFrameworkCore.csproj b/...icroservices.Cores.EntityFrameworkCore/EasyMicroservices.Cores.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>ef core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore</PackageTags>

diff --git a/...ational.EntityFrameworkCore/EasyMicroservices.Cores.Relational.EntityFrameworkCore.csproj b/...ational.EntityFrameworkCore/EasyMicroservices.Cores.Relational.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.79</Version>
+    <Version>0.0.0.80</Version>
     <Description>ef core of Relational database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore,Relational</PackageTags>