Changeset e423ff3 for iknow-api/Services

Timestamp:

10/28/25 10:51:32 (11 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

1d32d5c

Parents:

c0256f3 (diff), 28759eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Boris Gjorgjievski <69085722+imbrsk@…> (10/28/25 10:51:32)

git-committer:

GitHub <noreply@…> (10/28/25 10:51:32)

Message:

Merge branch 'Dev' into feature/getUser

Location:

iknow-api/Services

Files:

• Implementations/AuthService.cs (modified) (5 diffs)
• Implementations/RefreshTokenService.cs (added)
• Interfaces/IAuthService.cs (modified) (2 diffs)
• Interfaces/IRefreshTokenService.cs (added)

iknow-api/Services/Implementations/AuthService.cs

@@ -3 +3 @@
 using System.Text;
 using BCrypt.Net;
-using iknow_api.Controllers;
+using iknow_api.Services;
 using iknow_api.Models;
 using iknow_api.DTOs;
@@ -14 +14 @@
     {
         private readonly IUserRepository _userRepository;
+        private readonly IRefreshTokenRepository _refreshTokenRepository;
+        private readonly IRefreshTokenService _refreshTokenService;
         private readonly IConfiguration _configuration;
 
-        public AuthService(IUserRepository userRepository, IConfiguration configuration)
+        public AuthService(IUserRepository userRepository, IConfiguration configuration
+                            , IRefreshTokenService refreshTokenService, IRefreshTokenRepository refreshTokenRepository)
         {
             _userRepository = userRepository;
             _configuration = configuration;
+            _refreshTokenService = refreshTokenService;
+            _refreshTokenRepository = refreshTokenRepository;
         }
 
@@ -68 +73 @@
         }
 
-        public async Task<string?> LoginAsync(LoginDto loginDto)
+        public async Task<AuthResultDto?> LoginAsync(LoginDto loginDto)
         {
             var user = await _userRepository.GetUserByUsernameAsync(loginDto.Email);
@@ -74 +79 @@
                 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(userid);
+            }
+
+            return result;
         }
 
@@ -80 +96 @@
         {
             return await _userRepository.GetUsersCountAsync();
+        }
+
+        public async Task<AuthResultDto> GenerateNewJWT(VerifyRefreshTokenDto token)
+        {
+            int userid = await _refreshTokenRepository.GetUserId(token.token) ?? 0;
+            User user = await _userRepository.GetOnlyUserByIdAsync(userid);
+
+            var result = new AuthResultDto
+            {
+                AccessToken = CreateToken(user)
+            };
+            
+            return result;
         }
 

iknow-api/Services/Interfaces/IAuthService.cs

@@ -1 +1 @@
 using iknow_api.DTOs;
-
+using iknow_api.DTOs;
 namespace iknow_api.Services
 {
@@ -6 +6 @@
     {
         Task<bool> RegisterAsync(RegisterDto registerDto);
-        Task<string?> LoginAsync(LoginDto loginDto);
+        Task<AuthResultDto?> LoginAsync(LoginDto loginDto);
         Task<int> GetUsersCountAsync();
+        Task<AuthResultDto> GenerateNewJWT(VerifyRefreshTokenDto token);
     }
 }