Changeset e423ff3 for iknow-api

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

Files:

• Controllers/AuthController.cs (modified) (2 diffs)
• DTOs/RefreshTokenDTO.cs (added)
• DTOs/UserDTO.cs (modified) (1 diff)
• Data/AppDbContext.cs (modified) (1 diff)
• Migrations/20251028091953_new.Designer.cs (added)
• Migrations/20251028091953_new.cs (added)
• Migrations/AppDbContextModelSnapshot.cs (modified) (3 diffs)
• Models/RefreshToken.cs (added)
• Program.cs (modified) (1 diff)
• Repository/Implementations/RefreshTokenRepository.cs (added)
• Repository/Implementations/UserRepository.cs (modified) (1 diff)
• Repository/Interface/IRefreshTokenRepository.cs (added)
• Repository/Interface/IUserRepository.cs (modified) (1 diff)
• Services/Implementations/AuthService.cs (modified) (5 diffs)
• Services/Implementations/RefreshTokenService.cs (added)
• Services/Interfaces/IAuthService.cs (modified) (2 diffs)
• Services/Interfaces/IRefreshTokenService.cs (added)

iknow-api/Controllers/AuthController.cs

@@ -12 +12 @@
     {
         private readonly IAuthService _authService;
+        private readonly IRefreshTokenService _refreshTokenService;
 
-        public AuthController(IAuthService authService)
+        public AuthController(IAuthService authService, IRefreshTokenService refreshTokenService)
         {
             _authService = authService;
+            _refreshTokenService = refreshTokenService;
         }
 
@@ -54 +56 @@
             return Ok(new { message = "You are authorized!" });
         }
+
+        [HttpPost("verify-user-token")]
+        public async Task<IActionResult> VerifyToken([FromBody] VerifyRefreshTokenDto verifyRefreshToken)
+        {
+            if (await _refreshTokenService.VerifyRefreshToken(verifyRefreshToken))
+            { return Ok(await _authService.GenerateNewJWT(verifyRefreshToken)); }
+            else
+            { return BadRequest(new { message = "No token found!" }); }
+        }
     }
 }

iknow-api/DTOs/UserDTO.cs

@@ -6 +6 @@
         public string Email { get; set; } = string.Empty;
         public string Password { get; set; } = string.Empty;
+        public bool GenerateRefreshToken { get; set; }
     }
     public class GetUserDataDto

iknow-api/Data/AppDbContext.cs

@@ -13 +13 @@
         public DbSet<HighSchool> HighSchool { get; set; }
         public DbSet<EnrollmentInfo> EnrollmentInfo { get; set; }
+        public DbSet<RefreshToken> RefreshToken { get; set; }
     }
 }

iknow-api/Migrations/AppDbContextModelSnapshot.cs

@@ -24 +24 @@
 
             modelBuilder.Entity("iknow_api.Models.ContactInfo", b =>
+            modelBuilder.Entity("iknow_api.Models.RefreshToken", b =>
                 {
                     b.Property<int>("Id")
@@ -105 +106 @@
 
                     b.ToTable("HighSchool");
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsValid")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshToken");
                 });
 
@@ -149 +168 @@
                         .WithOne("ContactInfo")
                         .HasForeignKey("iknow_api.Models.ContactInfo", "UserId")
+            modelBuilder.Entity("iknow_api.Models.RefreshToken", b =>
+                {
+                    b.HasOne("iknow_api.Models.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();

iknow-api/Program.cs

@@ -50 +50 @@
 builder.Services.AddScoped<IUserService, UserService>();
 
+builder.Services.AddScoped<IRefreshTokenService, RefreshTokenService>();
+builder.Services.AddScoped<IUserRepository, UserRepository>(); 
+builder.Services.AddScoped<IRefreshTokenRepository, RefreshTokenRepository>(); 
 builder.Services.AddAuthorization();
 var app = builder.Build();

iknow-api/Repository/Implementations/UserRepository.cs

@@ -35 +35 @@
 
 
+        public async Task<User?> GetOnlyUserByIdAsync(int id)
+        {
+            return await _context.User.FirstOrDefaultAsync(u => u.Id == id);
+        }
         public async Task AddUserAsync(User user)
         {

iknow-api/Repository/Interface/IUserRepository.cs

@@ -12 +12 @@
         Task<int> GetUsersCountAsync();
         Task<User> GetUserByIdAsync(int id);
+        Task<User?> GetOnlyUserByIdAsync(int id);
+
     }
 }

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);
     }
 }