Adam
/
AyCode.Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improvements, fixes

This commit is contained in:
Loretta 2024-08-31 19:37:50 +02:00
parent 007d01a115
commit f0928b3b96
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AyCode.Core/Helpers/TaskHelper.cs
View File

@ -12,7 +12,7 @@
var result = false; var result = false;
var dtTimeout = DateTime.UtcNow.AddMilliseconds(msTimeout).Ticks; var dtTimeout = DateTime.UtcNow.AddMilliseconds(msTimeout).Ticks;
if (msFirstDelay > 0) await Task.Delay(msFirstDelay); if (msFirstDelay > 0) await Task.Delay(msFirstDelay).ConfigureAwait(false);
while (dtTimeout > DateTime.UtcNow.Ticks && !(result = predicate())) while (dtTimeout > DateTime.UtcNow.Ticks && !(result = predicate()))
await Task.Delay(msDelay).ConfigureAwait(false); //Thread.Sleep(msDelay); await Task.Delay(msDelay).ConfigureAwait(false); //Thread.Sleep(msDelay);

13
AyCode.Services.Server/Logins/AcLoginServiceServer.cs
View File

@ -183,13 +183,13 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
public string GenerateAccessToken(TUser user) public string GenerateAccessToken(TUser user)
{ {
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
GlobalLogger.Info("----------------------------------------------------------"); //GlobalLogger.Detail("----------------------------------------------------------");
if (configuration["JWT:Key"] == null) if (configuration["JWT:Key"] == null)
throw new SecurityTokenException("Token is null"); throw new SecurityTokenException("Token is null");
var keyDetail = Encoding.UTF8.GetBytes(configuration["JWT:Key"] ?? string.Empty); var keyDetail = Encoding.UTF8.GetBytes(configuration["JWT:Key"] ?? string.Empty);
GlobalLogger.Info(configuration["JWT:Key"]); GlobalLogger.Detail($"Key: {configuration["JWT:Key"]}");
var claims = new List<Claim> var claims = new List<Claim>
{ {
@ -201,20 +201,23 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
{ {
Audience = configuration["JWT:Audience"], Audience = configuration["JWT:Audience"],
Issuer = configuration["JWT:Issuer"], Issuer = configuration["JWT:Issuer"],
Expires = DateTime.UtcNow.AddMinutes(30), Expires = DateTime.UtcNow.AddHours(6),
//Expires = DateTime.UtcNow.AddSeconds(30),
Subject = new ClaimsIdentity(claims), Subject = new ClaimsIdentity(claims),
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyDetail), SecurityAlgorithms.HmacSha256Signature) SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyDetail), SecurityAlgorithms.HmacSha256Signature)
}; };
var token = tokenHandler.CreateToken(tokenDescriptor) as JwtSecurityToken; var token = tokenHandler.CreateToken(tokenDescriptor) as JwtSecurityToken;
var writtenToken = tokenHandler.WriteToken(token); var writtenToken = tokenHandler.WriteToken(token);
GlobalLogger.Info(writtenToken); GlobalLogger.Detail($"AccesToken: {writtenToken}");
return writtenToken; return writtenToken;
} }
public ClaimsPrincipal GetPrincipalFromExpiredToken(string token) public ClaimsPrincipal? GetPrincipalFromExpiredToken(string? token)
{ {
if (token.IsNullOrWhiteSpace()) return null;
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
if (configuration["JWT:Key"] == null) if (configuration["JWT:Key"] == null)