mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2024-04-18 00:33:46 +03:30
parent 3f3c283fef
commit fa5a83d8d3
7 changed files with 101 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Back/Services/servUser.cs
View File

@@ -13,18 +13,16 @@ namespace Back.Services
public class servUser
{
private readonly IConfiguration _configuration;
private readonly CheckPermission _checkPermission;
private readonly servPermission _servPermission;
private readonly servNotification _servNotification;
private readonly IAsyncRepository<User> _RepoUser;
private readonly IAsyncRepository<PermissionPeriod> _RepoPermissionPeriod;
public servUser(IConfiguration configuration,
CheckPermission checkPermission, servPermission servPermission
, servNotification servNotification, IAsyncRepository<User> RepoUser, IAsyncRepository<PermissionPeriod> RepoPermissionPeriod)
public servUser(IConfiguration configuration
, servNotification servNotification
, IAsyncRepository<User> RepoUser
, IAsyncRepository<PermissionPeriod> RepoPermissionPeriod)
{
_configuration = configuration;
_checkPermission = checkPermission;
_servPermission = servPermission;
_servNotification = servNotification;
_RepoUser = RepoUser;
_RepoPermissionPeriod = RepoPermissionPeriod;
@@ -32,16 +30,16 @@ namespace Back.Services
public async Task<User?> GetUserByUserNameAndPassword(string UserName, string Password)
{
return await _RepoUser.Get(w => w.Username == UserName && w.Password == Password.encrypted() && w.IsActive)
.Include(i => i.RolUsers)
.ThenInclude(ti => ti.rolePermissions)
.Include(i => i.RolUsers)
.ThenInclude(ti=>ti.Company)
.ThenInclude(ti => ti.PermissionPeriods)
.ThenInclude(ti => ti.Permission)
// .Include(i => i.RolUsers)
// .ThenInclude(ti => ti.rolePermissions)
// .Include(i => i.RolUsers)
// .ThenInclude(ti=>ti.Company)
//.ThenInclude(ti => ti.PermissionPeriods)
// .ThenInclude(ti => ti.Permission)
.Include(ti=>ti.RolUsers)
.ThenInclude(ti => ti.Company)
.ThenInclude(ti => ti.PermissionPeriods)
.ThenInclude(ti => ti.CalculationType)
//.ThenInclude(ti => ti.PermissionPeriods)
// .ThenInclude(ti => ti.CalculationType)
.FirstOrDefaultAsync();
}
public async Task<UserAuthenticationDTO?> UserAuthentication(string UserNameORUserID, string Password="")
@@ -158,7 +156,7 @@ namespace Back.Services
{
return await _RepoUser.Get(w => w.ID == UserID).FirstOrDefaultAsync();
}
public async void SetTokenAndDateLogininDB(int UserID,string Token)
public async Task SetTokenAndDateLogininDB(int UserID,string Token)
{
var user = await GetUserByUserID(UserID);
if (user != null)
@@ -274,7 +272,7 @@ namespace Back.Services
string Token = new JwtSecurityTokenHandler()
.WriteToken(jwtSecurityToke);
SetTokenAndDateLogininDB(UserId, Token);
await SetTokenAndDateLogininDB(UserId, Token);
//_contextMongodb.InsertItem(new SysLog()
//{
// TraceIdentifierID = _httpContextAccessor.HttpContext.TraceIdentifier,