Index: iknow-api/Controllers/AuthController.cs =================================================================== --- iknow-api/Controllers/AuthController.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Controllers/AuthController.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -12,8 +12,10 @@ { private readonly IAuthService _authService; + private readonly IRefreshTokenService _refreshTokenService; - public AuthController(IAuthService authService) + public AuthController(IAuthService authService, IRefreshTokenService refreshTokenService) { _authService = authService; + _refreshTokenService = refreshTokenService; } @@ -54,4 +56,13 @@ return Ok(new { message = "You are authorized!" }); } + + [HttpPost("verify-token")] + public async Task verifyToken([FromBody] VerifyRefreshTokenDto VerifyRefreshTokenDto) + { + if (await _refreshTokenService.VerifyRefreshToken(VerifyRefreshTokenDto)) + { return Ok(); } + else + { return BadRequest("No token found"); } + } } } Index: iknow-api/DTOs/RefreshTokenDTO.cs =================================================================== --- iknow-api/DTOs/RefreshTokenDTO.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/DTOs/RefreshTokenDTO.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,12 @@ +namespace iknow_api.DTOs +{ + public class VerifyRefreshTokenDto + { + public string? token; + } + public class AuthResultDto + { + public string AccessToken { get; set; } = string.Empty; + public string? RefreshToken { get; set; } + } +} Index: iknow-api/DTOs/UserDTO.cs =================================================================== --- iknow-api/DTOs/UserDTO.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/DTOs/UserDTO.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -6,4 +6,5 @@ public string Email { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; + public bool GenerateRefreshToken { get; set; } } Index: iknow-api/Data/AppDbContext.cs =================================================================== --- iknow-api/Data/AppDbContext.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Data/AppDbContext.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -10,4 +10,5 @@ public DbSet User { get; set; } + public DbSet RefreshToken { get; set; } } } Index: iknow-api/Migrations/20251022202014_InitialCreate.Designer.cs =================================================================== --- iknow-api/Migrations/20251022202014_InitialCreate.Designer.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ (revision ) @@ -1,67 +1,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using iknow_api.Data; - -#nullable disable - -namespace iknow_api.Migrations -{ - [DbContext(typeof(AppDbContext))] - [Migration("20251022202014_InitialCreate")] - partial class InitialCreate - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "9.0.10") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("iknow_api.Core.Models.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Bday") - .HasColumnType("timestamp with time zone"); - - b.Property("CreatedAt") - .HasColumnType("timestamp with time zone"); - - b.Property("Email") - .HasColumnType("text"); - - b.Property("Index") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("PasswordHash") - .HasColumnType("text"); - - b.Property("Role") - .HasColumnType("integer"); - - b.Property("Surname") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("User"); - }); -#pragma warning restore 612, 618 - } - } -} Index: iknow-api/Migrations/20251022202014_InitialCreate.cs =================================================================== --- iknow-api/Migrations/20251022202014_InitialCreate.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ (revision ) @@ -1,43 +1,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace iknow_api.Migrations -{ - /// - public partial class InitialCreate : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "User", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Name = table.Column(type: "text", nullable: true), - Surname = table.Column(type: "text", nullable: true), - Index = table.Column(type: "text", nullable: true), - Email = table.Column(type: "text", nullable: true), - PasswordHash = table.Column(type: "text", nullable: true), - Bday = table.Column(type: "timestamp with time zone", nullable: false), - CreatedAt = table.Column(type: "timestamp with time zone", nullable: false), - Role = table.Column(type: "integer", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_User", x => x.Id); - }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "User"); - } - } -} Index: iknow-api/Migrations/20251027140958_refreshtoken.Designer.cs =================================================================== --- iknow-api/Migrations/20251027140958_refreshtoken.Designer.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Migrations/20251027140958_refreshtoken.Designer.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,106 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using iknow_api.Data; + +#nullable disable + +namespace iknow_api.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20251027140958_refreshtoken")] + partial class refreshtoken + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("iknow_api.Models.RefreshToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsValid") + .HasColumnType("boolean"); + + b.Property("Token") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("RefreshToken"); + }); + + modelBuilder.Entity("iknow_api.Models.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Bday") + .HasColumnType("timestamp with time zone"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Email") + .HasColumnType("text"); + + b.Property("Index") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("Role") + .HasColumnType("integer"); + + b.Property("Surname") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("User"); + }); + + modelBuilder.Entity("iknow_api.Models.RefreshToken", b => + { + b.HasOne("iknow_api.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); +#pragma warning restore 612, 618 + } + } +} Index: iknow-api/Migrations/20251027140958_refreshtoken.cs =================================================================== --- iknow-api/Migrations/20251027140958_refreshtoken.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Migrations/20251027140958_refreshtoken.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,73 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace iknow_api.Migrations +{ + /// + public partial class refreshtoken : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "User", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + Name = table.Column(type: "text", nullable: true), + Surname = table.Column(type: "text", nullable: true), + Index = table.Column(type: "text", nullable: true), + Email = table.Column(type: "text", nullable: true), + PasswordHash = table.Column(type: "text", nullable: true), + Bday = table.Column(type: "timestamp with time zone", nullable: false), + CreatedAt = table.Column(type: "timestamp with time zone", nullable: false), + Role = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_User", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "RefreshToken", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + UserId = table.Column(type: "integer", nullable: false), + Token = table.Column(type: "text", nullable: false), + ExpiresAt = table.Column(type: "timestamp with time zone", nullable: false), + IsValid = table.Column(type: "boolean", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RefreshToken", x => x.Id); + table.ForeignKey( + name: "FK_RefreshToken_User_UserId", + column: x => x.UserId, + principalTable: "User", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_RefreshToken_UserId", + table: "RefreshToken", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "RefreshToken"); + + migrationBuilder.DropTable( + name: "User"); + } + } +} Index: iknow-api/Migrations/AppDbContextModelSnapshot.cs =================================================================== --- iknow-api/Migrations/AppDbContextModelSnapshot.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Migrations/AppDbContextModelSnapshot.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -23,5 +23,33 @@ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("iknow_api.Core.Models.User", b => + modelBuilder.Entity("iknow_api.Models.RefreshToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsValid") + .HasColumnType("boolean"); + + b.Property("Token") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("RefreshToken"); + }); + + modelBuilder.Entity("iknow_api.Models.User", b => { b.Property("Id") @@ -59,4 +87,15 @@ b.ToTable("User"); }); + + modelBuilder.Entity("iknow_api.Models.RefreshToken", b => + { + b.HasOne("iknow_api.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); #pragma warning restore 612, 618 } Index: iknow-api/Models/RefreshToken.cs =================================================================== --- iknow-api/Models/RefreshToken.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Models/RefreshToken.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,14 @@ +using iknow_api.Models; + +namespace iknow_api.Models +{ + public class RefreshToken + { + public int Id { get; set; } + public int UserId { get; set; } + public User User { get; set; } = null!; + public string Token { get; set; } + public DateTime ExpiresAt { get; set; } + public bool IsValid { get; set; } + } +} Index: iknow-api/Models/User.cs =================================================================== --- iknow-api/Models/User.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Models/User.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -21,4 +21,5 @@ public DateTime CreatedAt { get; set; } public UserRole Role { get; set; } + } } Index: iknow-api/Program.cs =================================================================== --- iknow-api/Program.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Program.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -42,5 +42,7 @@ // Register your services builder.Services.AddScoped(); -builder.Services.AddScoped(); // You'll need to add the UserRepository implementation +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddAuthorization(); var app = builder.Build(); Index: iknow-api/Repository/Implementations/RefreshTokenRepository.cs =================================================================== --- iknow-api/Repository/Implementations/RefreshTokenRepository.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Repository/Implementations/RefreshTokenRepository.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,37 @@ +using iknow_api.Models; +using iknow_api.Data; +using iknow_api.Models; +using Microsoft.EntityFrameworkCore; +using iknow_api.Services; +using iknow_api.DTOs; + +namespace iknow_api.Repositories +{ + public class RefreshTokenRepository : IRefreshTokenRepository + { + private readonly AppDbContext _context; + + public RefreshTokenRepository(AppDbContext context) + { + _context = context; + } + + public async Task AddTokenAsync(RefreshToken refreshToken) + { + _context.RefreshToken.Add(refreshToken); + await _context.SaveChangesAsync(); + } + + public Task DeleteTokenAsync(string refreshTokenDto) + { + throw new NotImplementedException(); + } + + + public async Task VerifyTokenAsync(VerifyRefreshTokenDto refreshTokenDto) + { + return await _context.RefreshToken + .AnyAsync(rt => rt.Token == refreshTokenDto.token && !rt.IsValid && rt.ExpiresAt > DateTime.UtcNow); + } + } +} Index: iknow-api/Repository/Interface/IRefreshTokenRepository.cs =================================================================== --- iknow-api/Repository/Interface/IRefreshTokenRepository.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Repository/Interface/IRefreshTokenRepository.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,11 @@ +using iknow_api.DTOs; +using iknow_api.Models; +namespace iknow_api.Repositories{ + public interface IRefreshTokenRepository + { + Task AddTokenAsync(RefreshToken refreshToken); + Task VerifyTokenAsync(VerifyRefreshTokenDto refreshTokenDto); + Task DeleteTokenAsync(string refreshTokenDto); + + } +} 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 LoginAsync(LoginDto loginDto) + public async Task 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; } Index: iknow-api/Services/Implementations/RefreshTokenService.cs =================================================================== --- iknow-api/Services/Implementations/RefreshTokenService.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Services/Implementations/RefreshTokenService.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,48 @@ +using iknow_api.DTOs; +using iknow_api.Services; +using System.Security.Cryptography; +using iknow_api.Models; +using iknow_api.Models; +using iknow_api.Repositories; + +namespace iknow_api.Services +{ + public class RefreshTokenService : IRefreshTokenService + { + private readonly IRefreshTokenRepository _refreshTokenRepository; + public RefreshTokenService(IRefreshTokenRepository refreshTokenRepository) + { + _refreshTokenRepository = refreshTokenRepository; + } + + public async Task GenerateRefreshToken(int userid) + { + var randomNumber = new byte[32]; + + using (var rng = RandomNumberGenerator.Create()) + { + rng.GetBytes(randomNumber); + } + + var refreshToken = Convert.ToBase64String(randomNumber); + + RefreshToken refreshTokenModel = new RefreshToken + { + Token = refreshToken, + UserId = userid, + ExpiresAt = DateTime.UtcNow.AddMonths(1), + IsValid = true + }; + + await _refreshTokenRepository.AddTokenAsync(refreshTokenModel); + + return refreshToken; + } + + public async Task VerifyRefreshToken(VerifyRefreshTokenDto refreshTokenDto) + { + + return await _refreshTokenRepository.VerifyTokenAsync(refreshTokenDto); + } + } +} Index: iknow-api/Services/Interfaces/IAuthService.cs =================================================================== --- iknow-api/Services/Interfaces/IAuthService.cs (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/Services/Interfaces/IAuthService.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -6,5 +6,5 @@ { Task RegisterAsync(RegisterDto registerDto); - Task LoginAsync(LoginDto loginDto); + Task LoginAsync(LoginDto loginDto); Task GetUsersCountAsync(); } Index: iknow-api/Services/Interfaces/IRefreshTokenService.cs =================================================================== --- iknow-api/Services/Interfaces/IRefreshTokenService.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) +++ iknow-api/Services/Interfaces/IRefreshTokenService.cs (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -0,0 +1,10 @@ +using iknow_api.DTOs; + +namespace iknow_api.Services +{ + public interface IRefreshTokenService + { + Task VerifyRefreshToken(VerifyRefreshTokenDto refreshTokenDto); + Task GenerateRefreshToken(int userid); + } +} Index: iknow-api/appsettings.Development.json =================================================================== --- iknow-api/appsettings.Development.json (revision e49c3ed29c9cabd1ad53e1ee59408de56ad28cc5) +++ iknow-api/appsettings.Development.json (revision 3347c1b709ebb3bce2d308c2a77f0e13470fc799) @@ -7,5 +7,5 @@ }, "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Port=5432;Database=myappdb;Username=postgres;Password=newpassword" + "DefaultConnection": "Host=localhost;Port=5432;Database=myappdb;Username=myuser;Password=kodrum2025" } }