From b9a2672272d0fbb7a24cf718458332bfc3834499 Mon Sep 17 00:00:00 2001
From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN>
Date: Wed, 24 Apr 2024 18:24:38 +0200
Subject: [PATCH] fixes

---
 TIAM.Database.Test/UserDalTests.cs            | 19 ++++++++++++++++++-
 .../Server/Controllers/UserAPIController.cs   |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs
index 1bb0f980..99813719 100644
--- a/TIAM.Database.Test/UserDalTests.cs
+++ b/TIAM.Database.Test/UserDalTests.cs
@@ -1,6 +1,7 @@
 using AyCode.Database.Tests.Users;
 using Newtonsoft.Json;
 using AyCode.Core.Consts;
+using AyCode.Core.Helpers;
 using TIAM.Database.DataLayers.Users;
 using TIAM.Database.DbContexts.Users;
 using TIAM.Entities.Profiles;
@@ -10,7 +11,8 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Addresses;
 using TIAMWebApp.Server.Services.Logins;
-//using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
+using AyCode.Interfaces.Users;
+using Microsoft.EntityFrameworkCore;
 
 namespace TIAM.Database.Test
 {
@@ -48,6 +50,21 @@ namespace TIAM.Database.Test
             //_userDal = new UserDal(_mockContext.Object);
         }
 
+        //[TestMethod]
+        public async Task ConvertOldPassword()
+        {
+            //var loginService = new LoginService(Dal, AppSettingsConfiguration);
+            var users = Dal.Context.Users.ToList();
+            
+            foreach (var user in users)
+            {
+                if (user.Password.Contains("$bcrypt$v=1$salt=")) continue;
+
+                user.Password = PasswordHasher.HashPassword(user.Password, PasswordHasher.GenerateDynamicSalt(user.Id));
+                await Dal.UpdateUserAsync(user);
+            }
+        }
+
         [TestMethod]
         public async Task RegisterUser_ReturnsUser_WhenUserExist()
         {
diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs
index 67c9ad04..003cd697 100644
--- a/TIAMWebApp/Server/Controllers/UserAPIController.cs
+++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs
@@ -96,8 +96,8 @@ namespace TIAMWebApp.Server.Controllers
                 {
                     Content = new AuthenticationResponse
                     {
-                        RefreshToken = loggedInModel.AccessToken,
-                        AccessToken = loggedInModel.LoggedInUser.RefreshToken
+                        RefreshToken = loggedInModel.LoggedInUser.RefreshToken,
+                        AccessToken = loggedInModel.AccessToken
                     },
 
                     IsSuccess = true,