diff --git a/LFlow.UserManagement/Model/UserDto.cs b/LFlow.UserManagement/Model/UserDto.cs index 46e65ca..ab72515 100644 --- a/LFlow.UserManagement/Model/UserDto.cs +++ b/LFlow.UserManagement/Model/UserDto.cs @@ -29,5 +29,9 @@ namespace LFlow.UserManagement.Model { get; set; } + public string? Token + { + get; set; + } } } diff --git a/LFlow.UserManagement/Service/UserManagementService.cs b/LFlow.UserManagement/Service/UserManagementService.cs index 715f4e8..641424e 100644 --- a/LFlow.UserManagement/Service/UserManagementService.cs +++ b/LFlow.UserManagement/Service/UserManagementService.cs @@ -1,8 +1,10 @@ -using LFlow.Base.Interfaces; +using Azure.Core; +using LFlow.Base.Interfaces; using LFlow.Base.Utils; using LFlow.Cache.Interface; using LFlow.UserManagement.Model; using LFlow.UserManagement.Util; +using Microsoft.AspNetCore.Http; namespace LFlow.UserManagement.Service { @@ -17,7 +19,7 @@ namespace LFlow.UserManagement.Service var userModel = repo.WhereSearchId(new UserModel { - UserName = user.UserName, + UserName = user!.UserName!, UserPassword = userPwd }); @@ -25,10 +27,19 @@ namespace LFlow.UserManagement.Service { return null; } - var loginedUser = repo.Get(userModel.FirstOrDefault()); + var firstUserId = userModel.FirstOrDefault(); + if (firstUserId == null) + { + return null; + } + var loginedUser = repo.Get(firstUserId); loginedUser.UserPassword = ""; - cacher.SetAsync(loginedUser.ID, loginedUser, TimeSpan.FromHours(2)); - return loginedUser.MapTo(); + var token = Guid.NewGuid().ToString(); + // loginedUser.Token = token; + cacher.SetAsync(token, loginedUser, TimeSpan.FromHours(2)); + var result = loginedUser.MapTo(); + result.Token = token; + return result; } public Task? LoginAsync(UserDto user)