From 3460ce6b04478d5212718c0fc7cd1a20aeb9a5ad Mon Sep 17 00:00:00 2001 From: Cody Larkin Date: Sun, 3 May 2026 18:04:40 -0400 Subject: [PATCH] need server and core webapp to work at same time for testing purposes --- RelayCore/Endpoints/AuthEndpoints.cs | 13 +++++++++---- RelayCore/Program.cs | 1 + RelayCore/RelayCore.csproj | 4 ++++ RelayServer/Program.cs | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/RelayCore/Endpoints/AuthEndpoints.cs b/RelayCore/Endpoints/AuthEndpoints.cs index debada4..6e35234 100644 --- a/RelayCore/Endpoints/AuthEndpoints.cs +++ b/RelayCore/Endpoints/AuthEndpoints.cs @@ -6,16 +6,21 @@ public static class AuthEndpoints { public static void MapAuthEndpoints(this WebApplication app) { - app.MapPost("/user/signin", async (AuthSignin request, APIAuthService service) => + app.MapPost("/user/signin", async (AuthSignin request, APIAuthService service, HttpContext context) => { - var token = await service.UserSigninAsync(request); + var ip = context.Connection.RemoteIpAddress?.MapToIPv4().ToString(); + context.Request.Headers.TryGetValue("User-Agent", out var userAgent); - return token != null ? Results.Ok(token) : Results.Unauthorized(); + Console.WriteLine($"IP:{ip}\nUserAgent:{userAgent}"); + // var token = await service.UserSigninAsync(request, ip, userAgent); + + // return token != null ? Results.Ok(token) : Results.Unauthorized(); + return Results.Ok(); }); app.MapPost("/user/register", async (AuthRegister request, APIAuthService service) => { var token = await service.UserRegisterAsync(request); - return token != null ? Results.Ok(token) : Results.Unauthorized(); + return token != null ? Results.Ok(token) : Results.Unauthorized(); }); app.MapPost("/server/verify/user", async (AuthUserVerify request, APIAuthService service) => { diff --git a/RelayCore/Program.cs b/RelayCore/Program.cs index 44d0bed..0b65ebc 100644 --- a/RelayCore/Program.cs +++ b/RelayCore/Program.cs @@ -25,6 +25,7 @@ Console.WriteLine($"Kira created: {ToJsonString(kira)}"); Console.WriteLine($"Test created: {ToJsonString(test)}"); var builder = WebApplication.CreateBuilder(args); +builder.WebHost.UseUrls("http://127.0.0.1:1337/"); builder.Services.AddSingleton(db); builder.Services.AddScoped(); diff --git a/RelayCore/RelayCore.csproj b/RelayCore/RelayCore.csproj index 3b7c5c1..56b48d9 100644 --- a/RelayCore/RelayCore.csproj +++ b/RelayCore/RelayCore.csproj @@ -14,4 +14,8 @@ + + + + diff --git a/RelayServer/Program.cs b/RelayServer/Program.cs index 24da678..02e5358 100644 --- a/RelayServer/Program.cs +++ b/RelayServer/Program.cs @@ -21,6 +21,7 @@ var bootstrapService = new ServerBootstrapService(db, coreClient, cryptoService) await bootstrapService.InitializeAsync(); var builder = WebApplication.CreateBuilder(args); +builder.WebHost.UseUrls("http://127.0.0.1:5000/"); builder.Services.AddSingleton(db); builder.Services.AddScoped();