Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW
This commit is contained in:
@@ -44,7 +44,7 @@ namespace IdentityService.WebApi.Applications.Auth
|
||||
}
|
||||
var token = await BuildTokenAsync(user);
|
||||
var refreshToken = await tokenService.CreateRefreshTokenAsync(user.Id);
|
||||
return Result<LoginResponse>.Success(new LoginResponse(user.Id, token, refreshToken, null));
|
||||
return Result<LoginResponse>.Success(new LoginResponse(user.Id, token, refreshToken, null, user.UserName, user.NickName,user.Avatar, user.CreationTime));
|
||||
}
|
||||
public async Task<Result<UserResponse?>> RegisterAsync(string userName, string password, string nickName)
|
||||
{
|
||||
@@ -80,7 +80,7 @@ namespace IdentityService.WebApi.Applications.Auth
|
||||
|
||||
var token = await BuildTokenAsync(user);
|
||||
|
||||
return Result<LoginResponse>.Success(new LoginResponse(user.Id, token, refreshToken, null));
|
||||
return Result<LoginResponse>.Success(new LoginResponse(user.Id, token, refreshToken, null, user.UserName, user.NickName, user.Avatar, user.CreationTime));
|
||||
}
|
||||
private async Task<string> BuildTokenAsync(Domain.Entities.User user)
|
||||
{
|
||||
|
||||
@@ -6,13 +6,21 @@
|
||||
public string Token { get; init; }
|
||||
public string RefreshToken { get; init; }
|
||||
public DateTime? Expired { get; init; }
|
||||
public string UserName { get; set; }
|
||||
public string NickName { get; set; }
|
||||
public string? Avatar { get; set; }
|
||||
public DateTimeOffset CreationTime { get; set; }
|
||||
|
||||
public LoginResponse(Guid userId, string token, string refreshToken, DateTime? expired)
|
||||
public LoginResponse(Guid userId, string token, string refreshToken, DateTime? expired, string userName, string nickName, string? avatar, DateTimeOffset creationTime)
|
||||
{
|
||||
UserId = userId;
|
||||
Token = token;
|
||||
RefreshToken = refreshToken;
|
||||
Expired = expired;
|
||||
UserName = userName;
|
||||
NickName = nickName;
|
||||
Avatar = avatar;
|
||||
CreationTime = creationTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user