RT state managment and rectangle support

dotnet/AipsCore/Application/Models/Whiteboard/Query/GetWhiteboardInfoRT/GetWhiteboardInfoRTQuery.cs

@@ -0,0 +1,5 @@
+using AipsCore.Application.Abstract.Query;
+
+namespace AipsCore.Application.Models.Whiteboard.Query.GetWhiteboardInfoRT;
+
+public record GetWhiteboardInfoRTQuery(Guid WhiteboardId) : IQuery<Infrastructure.Persistence.Whiteboard.Whiteboard>;

dotnet/AipsCore/Application/Models/Whiteboard/Query/GetWhiteboardInfoRT/GetWhiteboardInfoRTQueryHandler.cs

@@ -0,0 +1,40 @@
+using AipsCore.Application.Abstract.Query;
+using AipsCore.Domain.Common.Validation;
+using AipsCore.Domain.Models.Whiteboard.Validation;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
+using AipsCore.Infrastructure.Persistence.Db;
+using Microsoft.EntityFrameworkCore;
+
+namespace AipsCore.Application.Models.Whiteboard.Query.GetWhiteboardInfoRT;
+
+public class GetWhiteboardInfoRTQueryHandler
+    : IQueryHandler<GetWhiteboardInfoRTQuery, Infrastructure.Persistence.Whiteboard.Whiteboard>
+{
+    private readonly AipsDbContext _context;
+
+    public GetWhiteboardInfoRTQueryHandler(AipsDbContext context)
+    {
+        _context = context;
+    }
+    
+    public async Task<Infrastructure.Persistence.Whiteboard.Whiteboard> Handle(GetWhiteboardInfoRTQuery query, CancellationToken cancellationToken = default)
+    {
+        var whiteboard = await GetQuery(query.WhiteboardId).FirstOrDefaultAsync(cancellationToken);
+
+        if (whiteboard is null)
+        {
+            throw new ValidationException(WhiteboardErrors.NotFound(new WhiteboardId(query.WhiteboardId.ToString())));
+        }
+        
+        return whiteboard;
+    }
+    
+    private IQueryable<Infrastructure.Persistence.Whiteboard.Whiteboard> GetQuery(Guid whiteboardId)
+    {
+        return _context.Whiteboards
+            .Where(w => w.Id == whiteboardId)
+            .Include(w => w.Memberships)
+            .Include(w => w.Owner)
+            .Include(w => w.Shapes);
+    }
+}

dotnet/AipsRT/AipsRT.csproj

@@ -6,4 +6,16 @@
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\AipsCore\AipsCore.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="DotNetEnv" Version="3.1.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Services\" />
+    </ItemGroup>
+
 </Project>

dotnet/AipsRT/Hubs/Dtos/AddRectangleDto.cs

@@ -0,0 +1 @@
+namespace AipsRT.Hubs.Dtos;

dotnet/AipsRT/Hubs/TestHub.cs

@@ -1,9 +1,19 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
 
 namespace AipsRT.Hubs;
 
+[Authorize]
 public class TestHub : Hub
 {
+    public override async Task OnConnectedAsync()
+    {
+        Console.WriteLine($"LOOOOOOOOOG: [{Context.UserIdentifier}] User identifier connected");
+        Console.WriteLine($"LOOOOOG222: [{Context.User?.Identity?.Name}] User identity name connected");
+        
+        await base.OnConnectedAsync();
+    }
+
     public async Task SendText(string text)
     {
         await Clients.All.SendAsync("ReceiveText", text);

dotnet/AipsRT/Hubs/WhiteboardHub.cs

@@ -0,0 +1,49 @@
+using AipsRT.Model.Whiteboard;
+using AipsRT.Model.Whiteboard.Shapes;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace AipsRT.Hubs;
+
+[Authorize]
+public class WhiteboardHub : Hub
+{
+    private readonly WhiteboardManager _whiteboardManager;
+
+    public WhiteboardHub(WhiteboardManager whiteboardManager)
+    {
+        _whiteboardManager = whiteboardManager;
+    }
+
+    public async Task JoinWhiteboard(Guid whiteboardId)
+    {
+        if (!_whiteboardManager.WhiteboardExists(whiteboardId))
+            await _whiteboardManager.AddWhiteboard(whiteboardId);
+        
+        await Groups.AddToGroupAsync(Context.ConnectionId, whiteboardId.ToString());
+        
+        var state = _whiteboardManager.GetWhiteboard(whiteboardId)!;
+        
+        _whiteboardManager.AddUserToWhiteboard(Guid.Parse(Context.UserIdentifier!), whiteboardId);
+        
+        await Clients.Caller.SendAsync("InitWhiteboard", state);
+        await Clients.GroupExcept(whiteboardId.ToString(), Context.ConnectionId)
+            .SendAsync("Joined", Context.UserIdentifier!);
+    }
+
+    public async Task LeaveWhiteboard(Guid whiteboardId)
+    {
+        await Clients.GroupExcept(whiteboardId.ToString(), Context.ConnectionId)
+            .SendAsync("Leaved", Context.UserIdentifier!);
+    }
+
+    public async Task AddRectangle(Rectangle rectangle)
+    {
+        var whiteboard = _whiteboardManager.GetWhiteboardForUser(Guid.Parse(Context.UserIdentifier!))!;
+        
+        whiteboard.AddRectangle(rectangle);
+        
+        await Clients.GroupExcept(whiteboard.WhiteboardId.ToString(), Context.ConnectionId)
+            .SendAsync("AddedRectangle", rectangle);
+    }
+}

dotnet/AipsRT/Model/Whiteboard/GetWhiteboardService.cs

@@ -0,0 +1,52 @@
+using AipsCore.Application.Abstract;
+using AipsCore.Application.Models.Whiteboard.Query.GetWhiteboardInfoRT;
+using AipsCore.Domain.Models.Shape.Enums;
+using AipsRT.Model.Whiteboard.Shapes.Map;
+
+namespace AipsRT.Model.Whiteboard;
+
+public class GetWhiteboardService
+{
+    private readonly IDispatcher _dispatcher;
+
+    public GetWhiteboardService(IDispatcher dispatcher)
+    {
+        _dispatcher = dispatcher;
+    }
+
+    public async Task<Whiteboard> GetWhiteboard(Guid whiteboardId)
+    {
+        var query = new GetWhiteboardInfoRTQuery(whiteboardId);
+        return Map(await _dispatcher.Execute(query));
+    }
+
+    private static Whiteboard Map(AipsCore.Infrastructure.Persistence.Whiteboard.Whiteboard entity)
+    {
+        var whiteboard = new Whiteboard()
+        {
+            WhiteboardId = entity.Id,
+            OwnerId = entity.OwnerId,
+        };
+
+        foreach (var shape in entity.Shapes)
+        {
+            switch (shape.Type)
+            {
+                case ShapeType.Rectangle:
+                    whiteboard.AddRectangle(shape.ToRectangle());
+                    break;
+                case ShapeType.Arrow:
+                    whiteboard.AddArrow(shape.ToArrow());
+                    break;
+                case ShapeType.Line:
+                    whiteboard.AddLine(shape.ToLine());
+                    break;
+                case ShapeType.Text:
+                    whiteboard.AddTextShape(shape.ToTextShape());
+                    break;
+            }
+        }
+
+        return whiteboard;
+    }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/Arrow.cs

@@ -0,0 +1,10 @@
+using AipsRT.Model.Whiteboard.Structs;
+
+namespace AipsRT.Model.Whiteboard.Shapes;
+
+public class Arrow : Shape
+{
+    public Position EndPosition { get; set; }
+    
+    public int Thickness { get; set; }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/Line.cs

@@ -0,0 +1,10 @@
+using AipsRT.Model.Whiteboard.Structs;
+
+namespace AipsRT.Model.Whiteboard.Shapes;
+
+public class Line : Shape
+{
+    public Position EndPosition { get; set; }
+    
+    public int Thickness { get; set; }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/Map/ShapeMappingExtensions.cs

@@ -0,0 +1,57 @@
+using AipsRT.Model.Whiteboard.Structs;
+
+namespace AipsRT.Model.Whiteboard.Shapes.Map;
+
+public static class ShapeMappingExtensions
+{
+    extension(AipsCore.Infrastructure.Persistence.Shape.Shape shape)
+    {
+        public Rectangle ToRectangle()
+        {
+            return new Rectangle()
+            {
+                Id = shape.Id,
+                Position = new Position(shape.PositionX, shape.PositionY),
+                Color = shape.Color,
+                EndPosition = new Position(shape.EndPositionX!.Value, shape.EndPositionY!.Value),
+                BorderThickness = shape.Thickness!.Value,
+            };
+        }
+
+        public Arrow ToArrow()
+        {
+            return new Arrow()
+            {
+                Id = shape.Id,
+                Position = new Position(shape.PositionX, shape.PositionY),
+                Color = shape.Color,
+                EndPosition = new Position(shape.EndPositionX!.Value, shape.EndPositionY!.Value),
+                Thickness = shape.Thickness!.Value,
+            };
+        }
+        
+        public Line ToLine()
+        {
+            return new Line()
+            {
+                Id = shape.Id,
+                Position = new Position(shape.PositionX, shape.PositionY),
+                Color = shape.Color,
+                EndPosition = new Position(shape.EndPositionX!.Value, shape.EndPositionY!.Value),
+                Thickness = shape.Thickness!.Value,
+            };
+        }
+        
+        public TextShape ToTextShape()
+        {
+            return new TextShape()
+            {
+                Id = shape.Id,
+                Position = new Position(shape.PositionX, shape.PositionY),
+                Color = shape.Color,
+                TextValue = shape.TextValue!,
+                TextSize = shape.TextSize!.Value
+            };
+        }
+    }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/Rectangle.cs

@@ -0,0 +1,10 @@
+using AipsRT.Model.Whiteboard.Structs;
+
+namespace AipsRT.Model.Whiteboard.Shapes;
+
+public class Rectangle : Shape
+{
+    public Position EndPosition { get; set; }
+    
+    public int BorderThickness { get; set; }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/Shape.cs

@@ -0,0 +1,14 @@
+using AipsRT.Model.Whiteboard.Structs;
+
+namespace AipsRT.Model.Whiteboard.Shapes;
+
+public abstract class Shape
+{
+    public Guid Id { get; set; }
+    
+    public Guid OwnerId { get; set; }
+
+    public Position Position { get; set; }
+    
+    public string Color { get; set; }
+}

dotnet/AipsRT/Model/Whiteboard/Shapes/TextShape.cs

@@ -0,0 +1,10 @@
+using AipsRT.Model.Whiteboard.Shapes;
+
+namespace AipsRT.Model.Whiteboard.Shapes;
+
+public class TextShape : Shape
+{
+    public string TextValue { get; set; }
+    
+    public int TextSize { get; set; }
+}

dotnet/AipsRT/Model/Whiteboard/Structs/Position.cs

@@ -0,0 +1,13 @@
+namespace AipsRT.Model.Whiteboard.Structs;
+
+public struct Position
+{
+    public int X { get; set; }
+    public int Y { get; set; }
+
+    public Position(int x, int y)
+    {
+        X = x;
+        Y = y;
+    }
+}

dotnet/AipsRT/Model/Whiteboard/Whiteboard.cs

@@ -0,0 +1,41 @@
+using AipsRT.Model.Whiteboard.Shapes;
+
+namespace AipsRT.Model.Whiteboard;
+
+public class Whiteboard
+{
+    public Guid WhiteboardId { get; set; }
+    
+    public Guid OwnerId { get; set; }
+
+    public List<Shape> Shapes { get; } = [];
+
+    public List<Rectangle> Rectangles { get; } = [];
+    public List<Arrow> Arrows { get; } = [];
+    public List<Line> Lines { get; } = [];
+    public List<TextShape> TextShapes { get; } = [];
+
+    public void AddRectangle(Rectangle shape)
+    {
+        Shapes.Add(shape);
+        Rectangles.Add(shape);
+    }
+    
+    public void AddArrow(Arrow shape)
+    {
+        Shapes.Add(shape);
+        Arrows.Add(shape);
+    }
+    
+    public void AddLine(Line shape)
+    {
+        Shapes.Add(shape);
+        Lines.Add(shape);
+    }
+    
+    public void AddTextShape(TextShape shape)
+    {
+        Shapes.Add(shape);
+        TextShapes.Add(shape);
+    }
+}

dotnet/AipsRT/Model/Whiteboard/WhiteboardManager.cs

@@ -0,0 +1,59 @@
+using System.Collections.Concurrent;
+using AipsCore.Application.Abstract;
+
+namespace AipsRT.Model.Whiteboard;
+
+public class WhiteboardManager
+{
+    private readonly IServiceScopeFactory _scopeFactory;
+    private readonly ConcurrentDictionary<Guid, Whiteboard> _whiteboards = new();
+    private readonly ConcurrentDictionary<Guid, Guid> _userInWhiteboards = new();
+    
+    public WhiteboardManager(IServiceScopeFactory scopeFactory)
+    {
+        _scopeFactory = scopeFactory;
+    }
+
+    public async Task AddWhiteboard(Guid whiteboardId)
+    {
+        var getWhiteboardService = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<GetWhiteboardService>();
+        var whiteboard = await getWhiteboardService.GetWhiteboard(whiteboardId);
+        
+        _whiteboards[whiteboardId] = whiteboard;
+    }
+
+    public bool WhiteboardExists(Guid whiteboardId)
+    {
+        return _whiteboards.ContainsKey(whiteboardId);
+    }
+
+    public void RemoveWhiteboard(Guid whiteboardId)
+    {
+        _whiteboards.TryRemove(whiteboardId, out _);
+    }
+
+    public Whiteboard? GetWhiteboard(Guid whiteboardId)
+    {
+        return _whiteboards.GetValueOrDefault(whiteboardId);
+    }
+
+    public void AddUserToWhiteboard(Guid userId, Guid whiteboardId)
+    {
+        _userInWhiteboards[userId] = whiteboardId;
+    }
+
+    public Guid GetUserWhiteboard(Guid userId)
+    {
+        return _userInWhiteboards[userId];
+    }
+
+    public void RemoveUserFromWhiteboard(Guid userId, Guid whiteboardId)
+    {
+        _userInWhiteboards.TryRemove(whiteboardId, out _);
+    }
+
+    public Whiteboard? GetWhiteboardForUser(Guid userId)
+    {
+        return GetWhiteboard(GetUserWhiteboard(userId));
+    }
+}

dotnet/AipsRT/Program.cs

@@ -1,10 +1,22 @@
+using AipsCore.Infrastructure.DI;
 using AipsRT.Hubs;
+using AipsRT.Model.Whiteboard;
+using DotNetEnv;
 using Microsoft.AspNetCore.SignalR;
 
+Env.Load("../../.env");
+
 var builder = WebApplication.CreateBuilder(args);
 
+builder.Configuration.AddEnvironmentVariables();
+
 builder.Services.AddSignalR();
 
+builder.Services.AddAips(builder.Configuration);
+
+builder.Services.AddScoped<GetWhiteboardService>();
+builder.Services.AddSingleton<WhiteboardManager>();
+
 builder.Services.AddCors(options =>
 {
     options.AddPolicy("frontend",
@@ -26,6 +38,11 @@ app.MapGet("/test", (IHubContext<TestHub> hubContext) =>
 });
 
 app.UseCors("frontend");
+
+app.UseAuthentication();
+app.UseAuthorization();
+
 app.MapHub<TestHub>("/testhub");
+app.MapHub<WhiteboardHub>("/whiteboardhub");
 
 app.Run();

front/src/App.vue

@@ -1,11 +1,20 @@
 <script setup lang="ts">
-import { RouterView } from 'vue-router'
+import { RouterView, useRoute } from 'vue-router'
+import { computed } from 'vue'
 import AppTopBar from './components/AppTopBar.vue'
+
+const route = useRoute()
+const hideTopBar = computed(() => route.meta.hideTopBar === true)
 </script>
 
 <template>
+  <template v-if="hideTopBar">
+    <RouterView />
+  </template>
+  <template v-else>
     <AppTopBar />
     <main class="container py-4">
       <RouterView />
     </main>
+  </template>
 </template>

front/src/router/index.ts

@@ -35,6 +35,12 @@ const router = createRouter({
       component: () => import('../views/SignupView.vue'),
       meta: { guestOnly: true },
     },
+    {
+      path: '/whiteboard/:id',
+      name: 'whiteboard',
+      component: () => import('../views/WhiteboardView.vue'),
+      meta: { requiresAuth: true, hideTopBar: true },
+    },
   ],
 })
 

front/src/services/signalr.ts

@@ -3,6 +3,7 @@ import {
   HubConnectionBuilder,
   HubConnectionState,
 } from "@microsoft/signalr";
+import {useAuthStore} from "@/stores/auth.ts";
 
 export class SignalRService {
   private connection: HubConnection;
@@ -10,8 +11,12 @@ export class SignalRService {
   constructor(
     hubUrl: string,
   ) {
+    const authStore = useAuthStore();
+
     this.connection = new HubConnectionBuilder()
-      .withUrl(hubUrl)
+      .withUrl(hubUrl, {
+        accessTokenFactory: () => authStore.accessToken!
+      })
       .withAutomaticReconnect()
       .build();
   }

front/src/views/TestView.vue

@@ -1,13 +1,22 @@
 <script setup lang="ts">
 import {onMounted, ref} from "vue";
+import {useRouter} from "vue-router";
 import {testHubService} from "@/services/testHubService.ts";
 
+const router = useRouter();
 const displayText = ref("");
+const whiteboardId = ref("");
 
 function addText(textToAdd: string): void {
   displayText.value = displayText.value + textToAdd;
 }
 
+function joinWhiteboard() {
+  const id = whiteboardId.value.trim();
+  if (!id) return;
+  router.push(`/whiteboard/${id}`);
+}
+
 onMounted(async () => {
   await testHubService.connect();
 
@@ -19,4 +28,19 @@ onMounted(async () => {
 
 <template>
 <h1>{{ displayText }}</h1>
+
+<div class="mt-4" style="max-width: 500px">
+  <div class="input-group">
+    <input
+      v-model="whiteboardId"
+      type="text"
+      class="form-control"
+      placeholder="Whiteboard ID (GUID)"
+      @keyup.enter="joinWhiteboard"
+    />
+    <button class="btn btn-primary" @click="joinWhiteboard">
+      Join Whiteboard
+    </button>
+  </div>
+</div>
 </template>