From f0928b3b969637abc1c4603aba72079ca0d9fc8a Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Sat, 31 Aug 2024 19:37:50 +0200
Subject: [PATCH] improvements, fixes

---
 AyCode.Core/Helpers/TaskHelper.cs                   |  2 +-
 .../Logins/AcLoginServiceServer.cs                  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/AyCode.Core/Helpers/TaskHelper.cs b/AyCode.Core/Helpers/TaskHelper.cs
index 0041996..74954e8 100644
--- a/AyCode.Core/Helpers/TaskHelper.cs
+++ b/AyCode.Core/Helpers/TaskHelper.cs
@@ -12,7 +12,7 @@
                 var result = false;
                 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()))
                     await Task.Delay(msDelay).ConfigureAwait(false); //Thread.Sleep(msDelay);
diff --git a/AyCode.Services.Server/Logins/AcLoginServiceServer.cs b/AyCode.Services.Server/Logins/AcLoginServiceServer.cs
index 1980a52..0265edf 100644
--- a/AyCode.Services.Server/Logins/AcLoginServiceServer.cs
+++ b/AyCode.Services.Server/Logins/AcLoginServiceServer.cs
@@ -183,13 +183,13 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
     public string GenerateAccessToken(TUser user)
     {
         var tokenHandler = new JwtSecurityTokenHandler();
-        GlobalLogger.Info("----------------------------------------------------------");
+        //GlobalLogger.Detail("----------------------------------------------------------");
 
         if (configuration["JWT:Key"] == null)
             throw new SecurityTokenException("Token is null");
 
         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>
         {
@@ -201,20 +201,23 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
         {
             Audience = configuration["JWT:Audience"],
             Issuer = configuration["JWT:Issuer"],
-            Expires = DateTime.UtcNow.AddMinutes(30),
+            Expires = DateTime.UtcNow.AddHours(6),
+            //Expires = DateTime.UtcNow.AddSeconds(30),
             Subject = new ClaimsIdentity(claims),
             SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyDetail), SecurityAlgorithms.HmacSha256Signature)
         };
 
         var token = tokenHandler.CreateToken(tokenDescriptor) as JwtSecurityToken;
         var writtenToken = tokenHandler.WriteToken(token);
-        GlobalLogger.Info(writtenToken);
+        GlobalLogger.Detail($"AccesToken: {writtenToken}");
 
         return writtenToken;
     }
 
-    public ClaimsPrincipal GetPrincipalFromExpiredToken(string token)
+    public ClaimsPrincipal? GetPrincipalFromExpiredToken(string? token)
     {
+        if (token.IsNullOrWhiteSpace()) return null;
+
         var tokenHandler = new JwtSecurityTokenHandler();
 
         if (configuration["JWT:Key"] == null)