Index: iknow-api/Services/Implementations/AuthService.cs
===================================================================
--- iknow-api/Services/Implementations/AuthService.cs	(revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5)
+++ iknow-api/Services/Implementations/AuthService.cs	(revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799)
@@ -3,5 +3,5 @@
 using System.Text;
 using BCrypt.Net;
-using iknow_api.Controllers;
+using iknow_api.Services;
 using iknow_api.Models;
 using iknow_api.DTOs;
@@ -14,10 +14,12 @@
     {
         private readonly IUserRepository _userRepository;
+        private readonly IRefreshTokenService _refreshTokenService;
         private readonly IConfiguration _configuration;
 
-        public AuthService(IUserRepository userRepository, IConfiguration configuration)
+        public AuthService(IUserRepository userRepository, IConfiguration configuration, IRefreshTokenService refreshTokenService)
         {
             _userRepository = userRepository;
             _configuration = configuration;
+            _refreshTokenService = refreshTokenService;
         }
 
@@ -43,5 +45,5 @@
         }
 
-        public async Task<string?> LoginAsync(LoginDto loginDto)
+        public async Task<AuthResultDto?> LoginAsync(LoginDto loginDto)
         {
             var user = await _userRepository.GetUserByUsernameAsync(loginDto.Email);
@@ -49,5 +51,16 @@
                 return null;
 
-            return CreateToken(user);
+             var result = new AuthResultDto
+            {
+                AccessToken = CreateToken(user)
+            };
+
+            if (loginDto.GenerateRefreshToken)
+            {
+                //int userid = _userRepository.GetUserByUsernameAsync(loginDto.Email).Id;
+                result.RefreshToken = await _refreshTokenService.GenerateRefreshToken(6);
+            }
+
+            return result;
         }