Revize 3a6c189b

ClientInfo in DependencyInjection

ClientInfo contains IP and info about logged user

Backend/Backend/Controllers/AuthController.cs

@@ -6 +6 @@
 using Microsoft.AspNetCore.Mvc;
 using Models.Authentication;
 using RestAPI.Controllers.Common;
+using RestAPI.Utils;
 
 namespace RestAPI.Controllers;
 
@@ -48 +49 @@
     }
 
     [HttpGet("/auth/test")]
-    [ProducesResponseType((int) HttpStatusCode.OK, Type = typeof(User))]
+    [ProducesResponseType((int) HttpStatusCode.OK, Type = typeof(ClientInfo))]
     [ProducesResponseType((int) HttpStatusCode.Forbidden)]
-    public ActionResult<User> TestLogged([FromServices] User loggedUser)
+    public ActionResult<ClientInfo> TestLogged([FromServices] ClientInfo clientInfo)
     {
-        return loggedUser;
+        return clientInfo;
+    }
+    
+    
+    [AllowAnonymous]
+    [HttpGet("/auth/test/aa")]
+    [ProducesResponseType((int) HttpStatusCode.OK, Type = typeof(ClientInfo))]
+    [ProducesResponseType((int) HttpStatusCode.Forbidden)]
+    public ActionResult<ClientInfo> TestLoggedAA([FromServices] ClientInfo clientInfo)
+    {
+        return clientInfo;
     }
 }

Backend/Backend/Program.cs

@@ -8 +8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;
 using RestAPI.Middleware;
+using RestAPI.Utils;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -29 +30 @@
 builder.Services.AddSwaggerGen(c =>
 {
     c.SwaggerDoc("v1",
-        new OpenApiInfo { Title = "AnnotationTool", Description = "KIV/ASWI ZČU Plzeň, 2022", Version = "0.1.1" });
+        new OpenApiInfo {Title = "AnnotationTool", Description = "KIV/ASWI ZČU Plzeň, 2022", Version = "0.1.1"});
 });
 
 // JWT authentication
@@ -50 +51 @@
     );
 
 builder.Services.AddHttpContextAccessor();
-builder.Services.AddScoped<User>(provider =>
-    ((User?)provider.GetRequiredService<IHttpContextAccessor>().HttpContext?.Items["User"]));
+builder.Services.AddScoped<ClientInfo>(provider =>
+    ContextUtils.GetClientInfo(provider.GetRequiredService<IHttpContextAccessor>().HttpContext));
 
 // Database
 builder.Services.AddDbContext<DatabaseContext>();

Backend/Backend/Utils/ClientInfo.cs

@@ +1 @@
+using Core.Entities;
+
+namespace RestAPI.Utils;
+
+public class ClientInfo
+{
+    public bool IsLogged => LoggedUser != null;
+
+    public User? LoggedUser { get; set; } = null;
+
+    public string IP { get; set; } = "unknown";
+}

Backend/Backend/Utils/ContextUtils.cs

@@ +1 @@
+using Core.Entities;
+using Serilog;
+
+namespace RestAPI.Utils;
+
+public static class ContextUtils
+{
+    private static string GetIP(HttpContext httpContext)
+    {
+        try
+        {
+            return httpContext.Connection.RemoteIpAddress?.ToString() ?? "unknown";
+        }
+        catch (Exception ex)
+        {
+            Log.Logger.Warning("Not able to GetIP(): {Exception}", ex);
+            return "unknown";
+        }
+    }
+
+    public static ClientInfo GetClientInfo(HttpContext? context)
+    {
+        var ci = new ClientInfo();
+        if (context == null)
+        {
+            return ci;
+        }
+
+        string IP = GetIP(context);
+        ci.IP = IP;
+
+        User? loggedUser = (User?) context.Items["User"];
+        if (loggedUser == null)
+        {
+            ci.LoggedUser = null;
+        }
+        else
+        {
+            ci.LoggedUser = loggedUser;
+        }
+
+        return ci;
+    }
+}