Index: iknow-api/Controllers/AuthController.cs =================================================================== --- iknow-api/Controllers/AuthController.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/Controllers/AuthController.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,48 @@ +using FinXaccesApi.DTOs; +using FinXaccesApi.Services; +using Microsoft.AspNetCore.Mvc; + +namespace FinXaccesApi.Controllers +{ + [ApiController] + [Route("api/[controller]")] + public class AuthController : ControllerBase + { + private readonly IAuthService _authService; + + public AuthController(IAuthService authService) + { + _authService = authService; + } + + [HttpGet("testdb")] + public async Task TestDb() + { + try + { + var count = await _authService.GetUsersCountAsync(); + return Ok(new { message = "DB connection works!", usersCount = count }); + } + catch (Exception ex) + { + return BadRequest(new { message = "DB connection failed", error = ex.Message }); + } + } + + [HttpPost("register")] + public async Task Register([FromBody] UserDto request) + { + var result = await _authService.RegisterAsync(request); + if (!result) return BadRequest("User already exists"); + return Ok("User registered successfully"); + } + + [HttpPost("login")] + public async Task Login([FromBody] UserDto request) + { + var token = await _authService.LoginAsync(request); + if (token == null) return Unauthorized("Invalid credentials"); + return Ok(new { Token = token }); + } + } +} Index: iknow-api/Controllers/UsersControllers.cs =================================================================== --- iknow-api/Controllers/UsersControllers.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Controllers/UsersControllers.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -3,5 +3,5 @@ using Microsoft.AspNetCore.Mvc; using iknow_api.Core.Data; -using iknow_api.Repository.Interfaces; +using FinXaccesApi.Repositories; using iknow_api.Core.Interfaces; Index: iknow-api/DTOs/UserDTO.cs =================================================================== --- iknow-api/DTOs/UserDTO.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/DTOs/UserDTO.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,8 @@ +namespace FinXaccesApi.DTOs +{ + public class UserDto + { + public string Username { get; set; } = null!; + public string Password { get; set; } = null!; + } +} Index: now-api/Migrations/20251021141534_InitialCreate.Designer.cs =================================================================== --- iknow-api/Migrations/20251021141534_InitialCreate.Designer.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ (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.Core.Data; - -#nullable disable - -namespace iknow_api.Migrations -{ - [DbContext(typeof(AppDbContext))] - [Migration("20251021141534_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("Password") - .HasColumnType("text"); - - b.Property("Role") - .HasColumnType("integer"); - - b.Property("Surname") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("User"); - }); -#pragma warning restore 612, 618 - } - } -} Index: now-api/Migrations/20251021141534_InitialCreate.cs =================================================================== --- iknow-api/Migrations/20251021141534_InitialCreate.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ (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), - Password = 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/20251022202014_InitialCreate.Designer.cs =================================================================== --- iknow-api/Migrations/20251022202014_InitialCreate.Designer.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/Migrations/20251022202014_InitialCreate.Designer.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,67 @@ +// +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.Core.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 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/Migrations/20251022202014_InitialCreate.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,43 @@ +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/AppDbContextModelSnapshot.cs =================================================================== --- iknow-api/Migrations/AppDbContextModelSnapshot.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Migrations/AppDbContextModelSnapshot.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -46,5 +46,5 @@ .HasColumnType("text"); - b.Property("Password") + b.Property("PasswordHash") .HasColumnType("text"); Index: iknow-api/Models/User.cs =================================================================== --- iknow-api/Models/User.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Models/User.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -17,5 +17,5 @@ public string? Index { get; set; } public string? Email { get; set; } - public string? Password { get; set; } + public string? PasswordHash { get; set; } public DateTime Bday { get; set; } public DateTime CreatedAt { get; set; } Index: iknow-api/Program.cs =================================================================== --- iknow-api/Program.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Program.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -1,18 +1,20 @@ using Microsoft.EntityFrameworkCore; using iknow_api.Core.Data; +using FinXaccesApi.Services; +using FinXaccesApi.Repositories; var builder = WebApplication.CreateBuilder(args); // Add services to the container. - builder.Services.AddControllers(); -// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi builder.Services.AddOpenApi(); - +// Register DbContext builder.Services.AddDbContext(options => options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"))); -builder.Services.AddScoped(); +// Register your services +builder.Services.AddScoped(); +builder.Services.AddScoped(); // You'll need to add the UserRepository implementation var app = builder.Build(); @@ -24,12 +26,6 @@ } -builder.Services.AddDbContext(options => - options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"))); - - app.UseHttpsRedirection(); - app.UseAuthorization(); - app.MapControllers(); Index: iknow-api/Repository/Implementations/UserRepository.cs =================================================================== --- iknow-api/Repository/Implementations/UserRepository.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Repository/Implementations/UserRepository.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -1,10 +1,9 @@ -using System.Threading; -using System.Threading.Tasks; +using iknow_api.Core.Models; +using iknow_api.Core.Data; +using iknow_api.Core.Data; +using iknow_api.Core.Models; using Microsoft.EntityFrameworkCore; -using iknow_api.Core.Models; -using iknow_api.Repository.Interfaces; -using iknow_api.Core.Data; -namespace iknow_api.Repository +namespace FinXaccesApi.Repositories { public class UserRepository : IUserRepository @@ -17,16 +16,24 @@ } - public Task EmailExistsAsync(string email, CancellationToken cancellationToken = default) - => _context.User.AnyAsync(u => u.Email == email, cancellationToken); - - public async Task AddUserAsync(User user, CancellationToken cancellationToken = default) + public async Task UserExistsAsync(string username) { - await _context.User.AddAsync(user, cancellationToken); - await _context.SaveChangesAsync(cancellationToken); - return user; + return await _context.User.AnyAsync(u => u.Email == username); } - public Task GetUserByIdAsync(int id, CancellationToken cancellationToken = default) - => _context.User.FindAsync(new object[] { id }, cancellationToken).AsTask(); + public async Task GetUserByUsernameAsync(string username) + { + return await _context.User.FirstOrDefaultAsync(u => u.Email == username); + } + + public async Task AddUserAsync(User user) + { + _context.User.Add(user); + await _context.SaveChangesAsync(); + } + + public async Task GetUsersCountAsync() + { + return await _context.User.CountAsync(); + } } } Index: iknow-api/Repository/Interface/IUserRepository.cs =================================================================== --- iknow-api/Repository/Interface/IUserRepository.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Repository/Interface/IUserRepository.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -1,13 +1,11 @@ -using System.Threading; -using System.Threading.Tasks; using iknow_api.Core.Models; - -namespace iknow_api.Repository.Interfaces +namespace FinXaccesApi.Repositories { public interface IUserRepository { - Task EmailExistsAsync(string email, CancellationToken cancellationToken = default); - Task AddUserAsync(User user, CancellationToken cancellationToken = default); - Task GetUserByIdAsync(int id, CancellationToken cancellationToken = default); + Task UserExistsAsync(string username); + Task GetUserByUsernameAsync(string username); + Task AddUserAsync(User user); + Task GetUsersCountAsync(); } } Index: iknow-api/Services/Implementations/AuthService.cs =================================================================== --- iknow-api/Services/Implementations/AuthService.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/Services/Implementations/AuthService.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,79 @@ +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using BCrypt.Net; +using FinXaccesApi.Controllers; +using iknow_api.Core.Models; +using FinXaccesApi.DTOs; +using FinXaccesApi.Repositories; +using Microsoft.IdentityModel.Tokens; + +namespace FinXaccesApi.Services +{ + public class AuthService : IAuthService + { + private readonly IUserRepository _userRepository; + private readonly IConfiguration _configuration; + + public AuthService(IUserRepository userRepository, IConfiguration configuration) + { + _userRepository = userRepository; + _configuration = configuration; + } + + public async Task RegisterAsync(UserDto userDto) + { + if (await _userRepository.UserExistsAsync(userDto.Username)) + return false; + + var user = new User + { + Email = userDto.Username, + PasswordHash = BCrypt.Net.BCrypt.HashPassword(userDto.Password) + }; + + await _userRepository.AddUserAsync(user); + return true; + } + + public async Task LoginAsync(UserDto userDto) + { + var user = await _userRepository.GetUserByUsernameAsync(userDto.Username); + if (user == null || !BCrypt.Net.BCrypt.Verify(userDto.Password, user.PasswordHash)) + return null; + + return CreateToken(user); + } + + public async Task GetUsersCountAsync() + { + return await _userRepository.GetUsersCountAsync(); + } + + private string CreateToken(User user) + { + var claims = new[] + { + new Claim("id", user.Id.ToString()), + new Claim("username", user.Email) + }; + + var keyString = _configuration["Jwt:Key"]; + if (string.IsNullOrEmpty(keyString)) + throw new Exception("JWT Key is missing in configuration!"); + + var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(keyString)); + var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); + + var token = new JwtSecurityToken( + issuer: "finxacces-api", + audience: "finxacces-api", + claims: claims, + expires: DateTime.Now.AddHours(1), + signingCredentials: creds + ); + + return new JwtSecurityTokenHandler().WriteToken(token); + } + } +} Index: iknow-api/Services/Implementations/UserService.cs =================================================================== --- iknow-api/Services/Implementations/UserService.cs (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/Services/Implementations/UserService.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -1,33 +1,33 @@ -using Microsoft.EntityFrameworkCore; -using iknow_api.Core.Models; -using iknow_api.Repository.Interfaces; -// ...existing code... +//using Microsoft.EntityFrameworkCore; +//using iknow_api.Core.Models; +//using iknow_api.Repository.Interfaces; +//// ...existing code... -namespace iknow_api.Core.Services -{ - public class UserService - { - private readonly IUserRepository _users; +//namespace iknow_api.Core.Services +//{ +// public class UserService +// { +// private readonly IUserRepository _users; - public UserService(IUserRepository users) - { - _users = users; - } +// public UserService(IUserRepository users) +// { +// _users = users; +// } - public async Task AddUserAsync(User user, CancellationToken cancellationToken = default) - { - if (user == null) throw new ArgumentNullException(nameof(user)); +// public async Task AddUserAsync(User user, CancellationToken cancellationToken = default) +// { +// if (user == null) throw new ArgumentNullException(nameof(user)); - if (!string.IsNullOrWhiteSpace(user.Email)) - { - user.Email = user.Email.Trim(); +// if (!string.IsNullOrWhiteSpace(user.Email)) +// { +// user.Email = user.Email.Trim(); - var exists = await _users.EmailExistsAsync(user.Email, cancellationToken); - if (exists) - throw new InvalidOperationException("A user with this email already exists."); - } +// var exists = await _users.EmailExistsAsync(user.Email, cancellationToken); +// if (exists) +// throw new InvalidOperationException("A user with this email already exists."); +// } - return await _users.AddUserAsync(user, cancellationToken); - } - } -} +// return await _users.AddUserAsync(user, cancellationToken); +// } +// } +//} Index: iknow-api/Services/Interfaces/IAuthService.cs =================================================================== --- iknow-api/Services/Interfaces/IAuthService.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) +++ iknow-api/Services/Interfaces/IAuthService.cs (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -0,0 +1,12 @@ +using FinXaccesApi.Controllers; +using FinXaccesApi.DTOs; + +namespace FinXaccesApi.Services +{ + public interface IAuthService + { + Task RegisterAsync(UserDto userDto); + Task LoginAsync(UserDto userDto); + Task GetUsersCountAsync(); + } +} Index: iknow-api/appsettings.Development.json =================================================================== --- iknow-api/appsettings.Development.json (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/appsettings.Development.json (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -6,6 +6,6 @@ } }, - "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Port=5432;Database=myappdb;Username=myuser;Password=kodrum2025" - } + "ConnectionStrings": { + "DefaultConnection": "Host=localhost;Port=5432;Database=myappdb;Username=postgres;Password=newpassword" + } } Index: iknow-api/appsettings.json =================================================================== --- iknow-api/appsettings.json (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/appsettings.json (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -6,6 +6,9 @@ } }, - "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Port=3306;Database=myappdb;Username=root;Password=apipassword" - } + "ConnectionStrings": { + "DefaultConnection": "Host=localhost;Port=55432;Database=myappdb;Username=postgres;Password=newpassword" + }, + "Jwt": { + "Key": "YourSecretKeyHereMustBeAtLeast32CharactersLongForHS256Algorithm" + } } Index: iknow-api/iknow-api.csproj =================================================================== --- iknow-api/iknow-api.csproj (revision d025ba3ea156ecec18d37f6bd7da78a8ecb858e1) +++ iknow-api/iknow-api.csproj (revision 5b42c8d2d07de69ce14d68ac140c0400a59f97ad) @@ -9,4 +9,5 @@ + @@ -15,4 +16,5 @@ +