Merge branch 'main' into hotfix-create-rectangle

# Conflicts:
#	dotnet/AipsWebApi/Controllers/ShapeController.cs

dotnet/AipsWebApi/Controllers/ShapeController.cs

@@ -17,32 +17,4 @@ public class ShapeController : ControllerBase
     {
         _dispatcher = dispatcher;
     }
-
-    [HttpPost("rectangle")]
-    public async Task<ActionResult<int>> CreateRectangle(CreateRectangleCommand command, CancellationToken token)
-    {
-        var result = await _dispatcher.Execute(command, token);
-        return Ok(result);
-    }
-    
-    [HttpPost("arrow")]
-    public async Task<IActionResult> CreateArrow(CreateArrowCommand command, CancellationToken cancellationToken)
-    {
-        var result = await _dispatcher.Execute(command, cancellationToken);
-        return Ok(result);
-    }
-    
-    [HttpPost("textShape")]
-    public async Task<IActionResult> CreateTextShape(CreateTextShapeCommand command, CancellationToken cancellationToken)
-    {
-        var result = await _dispatcher.Execute(command, cancellationToken);
-        return Ok(result);
-    }
-    
-    [HttpPost("line")]
-    public async Task<IActionResult> CreateLine(CreateLineCommand command, CancellationToken cancellationToken)
-    {
-        var result = await _dispatcher.Execute(command, cancellationToken);
-        return Ok(result);
-    }
 }

dotnet/AipsWebApi/Controllers/UserController.cs

@@ -1,8 +1,9 @@
 using AipsCore.Application.Abstract;
-using AipsCore.Application.Models.User.Command.CreateUser;
+using AipsCore.Application.Common.Authentication;
+using AipsCore.Application.Models.User.Command.LogIn;
+using AipsCore.Application.Models.User.Command.SignUp;
 using AipsCore.Application.Models.User.Query.GetUser;
-using AipsCore.Domain.Common.Validation;
-using AipsCore.Domain.Models.User.ValueObjects;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace AipsWebApi.Controllers;
@@ -18,18 +19,19 @@ public class UserController : ControllerBase
         _dispatcher = dispatcher;
     }
 
-    [HttpGet("{userId}")]
-    public async Task<IActionResult> GetUser([FromRoute] string userId, CancellationToken cancellationToken)
+    [AllowAnonymous]
+    [HttpPost("signup")]
+    public async Task<IActionResult> SignUp(SignUpUserCommand command, CancellationToken cancellationToken)
     {
-        var query = new GetUserQuery(userId);
-        var result = await _dispatcher.Execute(query, cancellationToken);
-        return Ok(result);
+        var result = await _dispatcher.Execute(command, cancellationToken);
+        return Ok(result.IdValue);
     }
-    
-    [HttpPost]
-    public async Task<ActionResult<int>> CreateUser(CreateUserCommand command, CancellationToken cancellationToken)
+
+    [AllowAnonymous]
+    [HttpPost("login")]
+    public async Task<ActionResult<string>> LogIn(LogInUserCommand command, CancellationToken cancellationToken)
     {
-        var userId = await _dispatcher.Execute(command, cancellationToken);
-        return Ok(userId.IdValue);
+        var result = await _dispatcher.Execute(command, cancellationToken);
+        return Ok(result.Value);
     }
 }

dotnet/AipsWebApi/Controllers/WhiteboardController.cs

@@ -6,6 +6,7 @@ using AipsCore.Application.Models.Whiteboard.Command.KickUserFromWhiteboard;
 using AipsCore.Application.Models.Whiteboard.Command.UnbanUserFromWhiteboard;
 using AipsCore.Application.Models.Whiteboard.Query.GetRecentWhiteboards;
 using AipsCore.Domain.Models.Whiteboard;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace AipsWebApi.Controllers;
@@ -21,47 +22,11 @@ public class WhiteboardController : ControllerBase
         _dispatcher = dispatcher;
     }
     
+    [Authorize]
     [HttpPost]
     public async Task<ActionResult<int>> CreateWhiteboard(CreateWhiteboardCommand command, CancellationToken cancellationToken)
     {
         var whiteboardId = await _dispatcher.Execute(command, cancellationToken);
         return Ok(whiteboardId.IdValue);
     }
-
-    [HttpPost("adduser")]
-    public async Task<IActionResult> AddUser(AddUserToWhiteboardCommand command,
-        CancellationToken cancellationToken)
-    {
-        await _dispatcher.Execute(command, cancellationToken);
-        return Ok();
-    }
-
-    [HttpGet("recent")]
-    public async Task<ActionResult<ICollection<Whiteboard>>> Recent(GetRecentWhiteboardsQuery query, CancellationToken cancellationToken)
-    {
-        var result = await _dispatcher.Execute(query, cancellationToken);
-
-        return Ok(result);
-    }
-    
-    [HttpPut("banUser")]
-    public async Task<ActionResult> BanUserFromWhiteboard(BanUserFromWhiteboardCommand command, CancellationToken cancellationToken)
-    {
-        await _dispatcher.Execute(command, cancellationToken);
-        return Ok();
-    }
-    
-    [HttpPut("unbanUser")]
-    public async Task<ActionResult> UnbanUserFromWhiteboard(UnbanUserFromWhiteboardCommand command, CancellationToken cancellationToken)
-    {
-        await _dispatcher.Execute(command, cancellationToken);
-        return Ok();
-    }
-    
-    [HttpPut("kickUser")]
-    public async Task<ActionResult> KickUserFromWhiteboard(KickUserFromWhiteboardCommand command, CancellationToken cancellationToken)
-    {
-        await _dispatcher.Execute(command, cancellationToken);
-        return Ok();
-    }
 }

dotnet/AipsWebApi/Program.cs

@@ -1,4 +1,5 @@
 using AipsCore.Infrastructure.DI;
+using AipsCore.Infrastructure.Persistence.Db;
 using AipsWebApi.Middleware;
 using DotNetEnv;
 
@@ -15,15 +16,17 @@ builder.Services.AddAips(builder.Configuration);
 
 var app = builder.Build();
 
+await app.Services.InitializeInfrastructureAsync();
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
 }
 
-
 app.UseMiddleware<ExceptionHandlingMiddleware>();
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();