@@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
var pwd = IRCEmailPasswordHelper.GenerateRandomPassword(10);
|
||||
|
||||
|
||||
await _mailVerificationService.AdminResetPwdSendEmailAsync(identityUserId, pwd,inCommand.BaseUrl);
|
||||
await _mailVerificationService.AdminResetPwdSendEmailAsync(identityUserId, pwd, inCommand.BaseUrl);
|
||||
|
||||
await _identityUserRepository.UpdatePartialFromQueryAsync(t => t.Id == identityUserId, u => new IdentityUser()
|
||||
{
|
||||
@@ -936,11 +936,11 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpGet]
|
||||
public async Task<IResponseOutput> LoginOut(Guid identityUserId, Guid userRoleId)
|
||||
public async Task<IResponseOutput> LoginOut(Guid identityUserId, Guid? userRoleId)
|
||||
{
|
||||
await _fusionCache.RemoveAsync(CacheKeys.UserToken(identityUserId));
|
||||
|
||||
if (_identityUserRepository.Any(t => t.Id == identityUserId))
|
||||
if (_identityUserRepository.Any(t => t.Id == identityUserId) && userRoleId != null)
|
||||
{
|
||||
|
||||
var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync();
|
||||
@@ -1223,6 +1223,10 @@ namespace IRaCIS.Core.Application.Service
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
userLoginReturnModel.BasicInfo.HiddenEmail = userLoginReturnModel.BasicInfo.EMail;
|
||||
}
|
||||
|
||||
|
||||
await _fusionCache.SetAsync(CacheKeys.UserToken(identityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7));
|
||||
|
||||
Reference in New Issue
Block a user