fixes and cleanup

Sledgemapper.Api/Commands/DeleteNoteCommand.cs

@@ -1,3 +1,4 @@
+using System;
 using Sledgemapper.Shared.Entities;
 
 namespace Sledgemapper.Api.Commands
@@ -6,7 +7,7 @@ namespace Sledgemapper.Api.Commands
     {
         public Note Note { get; private set; }
 
-        public DeleteNoteCommand(string sessionName, Note note, string userId) : base(sessionName, userId)
+        public DeleteNoteCommand(Guid campaign, Guid mapName, Note note, string userId) : base(campaign, mapName, userId)
         {
             Note = note;
         }

Sledgemapper.Api/Commands/DeleteOverlayCommand.cs

@@ -1,3 +1,4 @@
+using System;
 using Sledgemapper.Shared.Entities;
 
 namespace Sledgemapper.Api.Commands
@@ -6,7 +7,7 @@ namespace Sledgemapper.Api.Commands
     {
         public Overlay Overlay { get; private set; }
 
-        public DeleteOverlayCommand(string sessionName, Overlay overlay, string userId) : base(sessionName, userId)
+        public DeleteOverlayCommand(Guid campaign, Guid mapName, Overlay overlay, string userId) : base(campaign, mapName, userId)
         {
             Overlay = overlay;
         }

Sledgemapper.Api/Commands/DeleteWallCommand.cs

@@ -1,3 +1,4 @@
+using System;
 using Sledgemapper.Shared.Entities;
 
 namespace Sledgemapper.Api.Commands
@@ -6,7 +7,7 @@ namespace Sledgemapper.Api.Commands
     {
         public Wall Wall { get; private set; }
 
-        public DeleteWallCommand(string sessionName, Wall wall, string userId) : base(sessionName, userId)
+        public DeleteWallCommand(Guid campaign, Guid mapName, Wall wall, string userId) : base(campaign, mapName, userId)
         {
             Wall = wall;
         }

Sledgemapper.Api/Controllers/AuthManagementController.cs

@@ -162,7 +162,7 @@ namespace Sledgemapper.Api.Controllers
 
                 Subject = new ClaimsIdentity(new[]
                 {
-                new Claim("Id", user.Id.ToString()),
+                new Claim("Id", user.Id),
                 new Claim(JwtRegisteredClaimNames.Sub, user.Email),
                 new Claim(JwtRegisteredClaimNames.Email, user.Email),
                 // the JTI is used for our refresh token which we will be convering in the next video

Sledgemapper.Api/Controllers/CampaignController.cs

@@ -24,7 +24,7 @@ namespace Sledgemapper.Api.Controllers
         [Route("{campaignName}")]
         public async Task<ActionResult<bool>> Post(string campaignName)
         {
-            var result = await _mediator.Send(new NewCampaignCommand(campaignName, UserId.ToString()));
+            var result = await _mediator.Send(new NewCampaignCommand(campaignName, UserId));
             if (!result)
             {
                 return BadRequest();
@@ -51,7 +51,7 @@ namespace Sledgemapper.Api.Controllers
         [Route("{campaignName}/players/{email}")]
         public async Task<bool> Invite(string campaignName, string email)
         {
-            var result = await _mediator.Send(new InvitePlayerToCampaignCommand(campaignName, email, UserId.ToString()));
+            var result = await _mediator.Send(new InvitePlayerToCampaignCommand(campaignName, email, UserId));
             return result;
         }
 
@@ -59,7 +59,7 @@ namespace Sledgemapper.Api.Controllers
         [Route("{campaignName}/players")]
         public async Task<List<Player>> GetPlayers(string campaignName)
         {
-            var result = await _mediator.Send(new GetCampaignPlayersCommand(campaignName, UserId.ToString()));
+            var result = await _mediator.Send(new GetCampaignPlayersCommand(campaignName, UserId));
             return result;
         }
 
@@ -68,7 +68,7 @@ namespace Sledgemapper.Api.Controllers
         [Route("{campaignName}/maps")]
         public async Task<List<Session>> GetMaps(Guid campaignName)
         {
-            var result = await _mediator.Send(new GetCampaignMapsCommand(campaignName, UserId.ToString()));
+            var result = await _mediator.Send(new GetCampaignMapsCommand(campaignName, UserId));
             return result;
         }
 

Sledgemapper.Api/Controllers/MapController.cs

@@ -1,11 +1,11 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Sledgemapper.Api.Commands;
 using Sledgemapper.Shared.Entities;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Sledgemapper.Api.Controllers
 {
@@ -14,15 +14,30 @@ namespace Sledgemapper.Api.Controllers
     public class MapController : ControllerBase
     {
         private readonly IMediator _mediator;
+
+        public MapController(IMediator mediator)
+        {
+            _mediator = mediator;
+        }
+
         private string UserId => HttpContext.User.Claims.FirstOrDefault(m => m.Type == "Id").Value;
 
-        public MapController(IMediator mediator) => _mediator = mediator;
-
-        [HttpPost]
-        public async Task<Guid> Post(string campaign, string mapName)
+        [HttpDelete("overlay")]
+        public async Task Delete(Guid campaign, Guid mapName, [FromBody] Overlay overlay)
         {
-            var result = await _mediator.Send(new NewSessionCommand(campaign, mapName, UserId));
-            return result;
+            await _mediator.Send(new DeleteOverlayCommand(campaign, mapName, overlay, UserId));
+        }
+
+        [HttpDelete("wall")]
+        public async Task Delete(Guid campaign, Guid mapName, [FromBody] Wall wall)
+        {
+            await _mediator.Send(new DeleteWallCommand(campaign, mapName, wall, UserId));
+        }
+
+        [HttpDelete("note")]
+        public async Task Delete(Guid campaign, Guid mapName, [FromBody] Note note)
+        {
+            await _mediator.Send(new DeleteNoteCommand(campaign, mapName, note, UserId));
         }
 
         [HttpGet]
@@ -32,6 +47,13 @@ namespace Sledgemapper.Api.Controllers
             return result;
         }
 
+        [HttpPost]
+        public async Task<Guid> Post(string campaign, string mapName)
+        {
+            var result = await _mediator.Send(new NewSessionCommand(campaign, mapName, UserId));
+            return result;
+        }
+
         [HttpPost("snapshot")]
         public async Task Post(string campaign, string mapName, [FromBody] Session session)
         {
@@ -67,23 +89,5 @@ namespace Sledgemapper.Api.Controllers
         {
             await _mediator.Send(new NewLineCommand(campaign, mapName, line, UserId));
         }
-
-        [HttpDelete("overlay")]
-        public async Task Delete(string campaign, string mapName, [FromBody] Overlay overlay)
-        {
-            await _mediator.Send(new DeleteOverlayCommand(mapName, overlay, UserId));
-        }
-
-        [HttpDelete("wall")]
-        public async Task Delete(string campaign, string mapName, [FromBody] Wall wall)
-        {
-            await _mediator.Send(new DeleteWallCommand(mapName, wall, UserId));
-        }
-
-        [HttpDelete("note")]
-        public async Task Delete(string campaign, string mapName, [FromBody] Note note)
-        {
-            await _mediator.Send(new DeleteNoteCommand(mapName, note, UserId));
-        }
     }
 }

Sledgemapper.Api/Core/Entities/MapLog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Api.Models
+namespace Sledgemapper.Api.Core.Entities
 {
 
     public class MapLog

Sledgemapper.Api/Core/Entities/Session.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Sledgemapper.Api.Models
+namespace Sledgemapper.Api.Core.Entities
 {
     [Index(nameof(CampaignId), nameof(SessionName), IsUnique = true)]
     public class Session

Sledgemapper.Api/Core/Entities/SessionUser.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Api.Models
+namespace Sledgemapper.Api.Core.Entities
 {
     public class SessionUser
     {

Sledgemapper.Api/Core/Entities/Snapshot.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Api.Models
+namespace Sledgemapper.Api.Core.Entities
 {
 
     public class Snapshot

Sledgemapper.Api/Core/Entities/User.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Identity;
 
-namespace Sledgemapper.Entities
+namespace Sledgemapper.Api.Core.Entities
 {
     public class User : IdentityUser
     {
@@ -13,6 +13,6 @@ namespace Sledgemapper.Entities
         public string Initials { get; set; }
         // public byte[] PasswordHash { get; set; }
         public byte[] PasswordSalt { get; set; }
-        public ICollection<Api.Core.Entities.Campaign> Campaigns {get;set;}
+        public ICollection<Campaign> Campaigns { get; set; }
     }
 }

Sledgemapper.Api/Core/Entities/UserConnection.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Api.Models
+namespace Sledgemapper.Api.Core.Entities
 {
     public class UserConnection
     {

Sledgemapper.Api/Handlers/BaseCommandHandler.cs

@@ -7,31 +7,29 @@ using System.Threading.Tasks;
 using System;
 using Microsoft.EntityFrameworkCore;
 using Sledgemapper.Api.Models;
-using System.Collections.Generic;
 using Sledgemapper.Api.Core.Entities;
 
 namespace Sledgemapper.Api.Handlers
 {
     public abstract class BaseCommandHandler<TRequest, TResponse> : IRequestHandler<TRequest, TResponse> where TRequest : BaseCommand<TResponse>
     {
-        protected SledgemapperDbContext Dbcontext { get; }
+        protected SledgemapperDbContext DbContext { get; }
 
         protected IMediator Mediator { get; }
 
 
-
         public abstract Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken);
 
-        public BaseCommandHandler(IMediator mediator, SledgemapperDbContext dbcontext)
+        protected BaseCommandHandler(IMediator mediator, SledgemapperDbContext dbContext)
         {
-            Dbcontext = dbcontext;
+            DbContext = dbContext;
             Mediator = mediator;
         }
 
         protected async Task CheckAuthorization(TRequest command)
         {
-            var user = await Dbcontext.Users.FindAsync(command.UserId);
-            Dbcontext.Attach(user);
+            var user = await DbContext.Users.FindAsync(command.UserId);
+            DbContext.Attach(user);
 
 
             var campaign = await GetCampaignForUser(command);
@@ -46,9 +44,9 @@ namespace Sledgemapper.Api.Handlers
 
         protected async Task<Campaign> GetCampaignForUser(TRequest command)
         {
-            var user = await Dbcontext.Users.FindAsync(command.UserId);
-            Dbcontext.Attach(user);
-            var campaign = await Dbcontext
+            var user = await DbContext.Users.FindAsync(command.UserId);
+            DbContext.Attach(user);
+            var campaign = await DbContext
                 .Campaigns
                 .Where(campaign => campaign.CampaignId == command.Campaign)
                 .Include(c => c.InvitedUsers)
@@ -60,8 +58,8 @@ namespace Sledgemapper.Api.Handlers
 
         protected async Task<Session> SaveLog(TRequest command, string operation, string type, string data, CancellationToken cancellationToken)
         {
-            var session = Dbcontext.Sessions.First(m => m.SessionId == command.SessionId);
-            Dbcontext.MapLogs.Add(new Models.MapLog
+            var session = DbContext.Sessions.First(m => m.SessionId == command.SessionId);
+            DbContext.MapLogs.Add(new MapLog
             {
                 Operation = operation,
                 SessionId = session.SessionId,
@@ -70,7 +68,7 @@ namespace Sledgemapper.Api.Handlers
                 Object = data,
                 UserId = command.UserId,
             });
-            await Dbcontext.SaveChangesAsync(cancellationToken);
+            await DbContext.SaveChangesAsync(cancellationToken);
             return session;
         }
 

Sledgemapper.Api/Handlers/GetMapSnapshotCommandHandler.cs

@@ -6,31 +6,32 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Linq;
 using Sledgemapper.Api.Models;
+using Sledgemapper.Api.Commands;
 
-namespace Sledgemapper.Api.Commands
+namespace Sledgemapper.Api.Handlers
 {
-    public class GetMapSnapshotCommandHandler : IRequestHandler<GetMapSnapshotCommand, Shared.Entities.Session>
+    public class GetMapSnapshotCommandHandler : IRequestHandler<GetMapSnapshotCommand, Session>
     {
         private readonly SledgemapperDbContext _dbcontext;
 
         public GetMapSnapshotCommandHandler(SledgemapperDbContext dbcontext) { _dbcontext = dbcontext; }
 
-        public async Task<Shared.Entities.Session> Handle(GetMapSnapshotCommand notification, CancellationToken cancellationToken)
+        public async Task<Session> Handle(GetMapSnapshotCommand notification, CancellationToken cancellationToken)
         {
             Snapshot snapshot;
             double timestamp;
-            Shared.Entities.Session mapSession;
+            Session mapSession;
             var session = _dbcontext.Sessions.First(m => m.SessionId == notification.MapId);
             snapshot = _dbcontext.Snapshots.OrderByDescending(s => s.Timestamp).FirstOrDefault(m => m.SessionId == session.SessionId);
             if (snapshot is null)
             {
 
                 timestamp = 0;
-                mapSession = new Shared.Entities.Session();
+                mapSession = new Session();
             }
             else
             {
-                mapSession = JsonSerializer.Deserialize<Shared.Entities.Session>(snapshot.Object);
+                mapSession = JsonSerializer.Deserialize<Session>(snapshot.Object);
                 timestamp = snapshot.Timestamp;
             }
 

Sledgemapper.Api/Handlers/NewLineCommandHandler.cs

@@ -10,7 +10,7 @@ namespace Sledgemapper.Api.Handlers
 {
     public class NewLineCommandHandler : BaseCommandHandler<NewLineCommand, bool>
     {
-        public NewLineCommandHandler(IMediator mediator, SledgemapperDbContext dbcontext) : base(mediator, dbcontext)
+        public NewLineCommandHandler(IMediator mediator, SledgemapperDbContext dbContext) : base(mediator, dbContext)
         {
         }
 

Sledgemapper.Api/Handlers/NewSnapshotCommandHandler.cs

@@ -5,8 +5,9 @@ using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Linq;
+using Sledgemapper.Api.Commands;
 
-namespace Sledgemapper.Api.Commands
+namespace Sledgemapper.Api.Handlers
 {
     public class NewSnapshotCommandHandler : IRequestHandler<NewSnapshotCommand, bool>
     {
@@ -20,7 +21,8 @@ namespace Sledgemapper.Api.Commands
 
             var session = _dbcontext.Sessions.First(m => m.SessionName == notification.SessionName);
 
-           var newSnapshot = new Models.Snapshot{
+            var newSnapshot = new Models.Snapshot
+            {
                 SessionId = session.SessionId,
                 Timestamp = notification.Timestamp,
                 Object = JsonSerializer.Serialize(notification.Session)

Sledgemapper.Api/Handlers/NewTileCommandHandler.cs

@@ -4,13 +4,13 @@ using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Sledgemapper.Api.Notifications;
-using Sledgemapper.Api.Handlers;
+using Sledgemapper.Api.Commands;
 
-namespace Sledgemapper.Api.Commands
+namespace Sledgemapper.Api.Handlers
 {
     public class NewTileCommandHandler : BaseCommandHandler<NewTileCommand, bool>
     {
-        public NewTileCommandHandler(IMediator mediator, SledgemapperDbContext dbcontext) : base(mediator, dbcontext)
+        public NewTileCommandHandler(IMediator mediator, SledgemapperDbContext dbContext) : base(mediator, dbContext)
         {
         }
 

Sledgemapper.Api/Handlers/NewWallCommandHandler.cs

@@ -10,7 +10,7 @@ namespace Sledgemapper.Api.Handlers
 {
     public class NewWallCommandHandler : BaseCommandHandler<NewWallCommand, bool>
     {
-        public NewWallCommandHandler(IMediator mediator, SledgemapperDbContext dbcontext) : base(mediator, dbcontext)
+        public NewWallCommandHandler(IMediator mediator, SledgemapperDbContext dbContext) : base(mediator, dbContext)
         {
         }
 

Sledgemapper.Api/Handlers/PingCommandHandler.cs

@@ -1,28 +0,0 @@
-// using MediatR;
-// using Sledgemapper.Api.Infrastructure.Data;
-// using System.Threading;
-// using System.Threading.Tasks;
-// using Sledgemapper.Api.Notifications;
-// using System.Linq;
-
-// namespace Sledgemapper.Api.Commands
-// {
-//     public class PingCommandHandler : IRequestHandler<PingCommand, bool>
-//     {
-//         private readonly SledgemapperDbContext _dbcontext;
-//         private readonly IMediator _mediator;
-
-//         public PingCommandHandler(IMediator mediator, SledgemapperDbContext dbcontext) { _dbcontext = dbcontext; _mediator = mediator; }
-
-//         public async Task<bool> Handle(PingCommand notification, CancellationToken cancellationToken)
-//         {
-//             var session = _dbcontext.Sessions.First(m => m.SessionName == notification.SessionName);
-
-         
-//             await _mediator.Publish(new PingNotification(session, notification.Location, notification.UserId));
-//             return true;
-//         }
-
-
-//     }
-// }

Sledgemapper.Api/Handlers/SendDeleteNoteMessage.cs

@@ -16,7 +16,7 @@ namespace Sledgemapper.Api.Handlers
 
         public async Task Handle(DeleteNoteNotification notification, CancellationToken cancellationToken)
         {
-            await _hub.Clients.Groups(notification.Session.SessionName).DeleteNote(notification.Note);
+            await _hub.Clients.Groups(notification.Session.SessionId.ToString()).DeleteNote(notification.Note);
         }
     }
 }

Sledgemapper.Api/Handlers/SendDeleteOverlayMessage.cs

@@ -16,7 +16,7 @@ namespace Sledgemapper.Api.Handlers
 
         public async Task Handle(DeleteOverlayNotification notification, CancellationToken cancellationToken)
         {
-            await _hub.Clients.Groups(notification.Session.SessionName).DeleteOverlay(notification.Overlay);
+            await _hub.Clients.Groups(notification.Session.SessionId.ToString()).DeleteOverlay(notification.Overlay);
         }
     }
 }

Sledgemapper.Api/Handlers/SendDeleteTileMessage.cs

@@ -16,7 +16,7 @@ namespace Sledgemapper.Api.Handlers
 
         public async Task Handle(DeleteTileNotification notification, CancellationToken cancellationToken)
         {
-            await _hub.Clients.Groups(notification.Session.SessionName).DeleteTile(notification.Tile);
+            await _hub.Clients.Groups(notification.Session.SessionId.ToString()).DeleteTile(notification.Tile);
         }
     }
 }

Sledgemapper.Api/Handlers/SendDeleteWallMessage.cs

@@ -16,7 +16,7 @@ namespace Sledgemapper.Api.Handlers
 
         public async Task Handle(DeleteWallNotification notification, CancellationToken cancellationToken)
         {
-            await _hub.Clients.Groups(notification.Session.SessionName).DeleteWall(notification.Wall);
+            await _hub.Clients.Groups(notification.Session.SessionId.ToString()).DeleteWall(notification.Wall);
         }
     }
 }

Sledgemapper.Api/Handlers/SendPingMessage.cs

@@ -1,23 +0,0 @@
-// using MediatR;
-// using Microsoft.AspNetCore.SignalR;
-// using Sledgemapper.Api.Notifications;
-// using Sledgemapper.Clients;
-// using System.Threading;
-// using System.Threading.Tasks;
-// using Sledgemapper.Api.Hubs;
-
-// namespace Sledgemapper.Api.Handlers
-// {
-//     public class SendPingMessage : INotificationHandler<PingNotification>
-//     {
-//         private readonly IHubContext<SledgemapperHub, ISledgemapperClient> _hub;
-
-//         public SendPingMessage(IHubContext<SledgemapperHub, ISledgemapperClient> hub) => _hub = hub;
-
-//         public async Task Handle(PingNotification notification, CancellationToken cancellationToken)
-//         {
-            
-//             await _hub.Clients.Groups(notification.Session.SessionName).Ping(notification.Location, notification.UserId);
-//         }
-//     }
-// }

Sledgemapper.Api/Handlers/StartNewSessionHandler.cs

@@ -3,7 +3,6 @@ using Sledgemapper.Api.Commands;
 using Sledgemapper.Api.Infrastructure.Data;
 using Sledgemapper.Api.Models;
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -29,8 +28,8 @@ namespace Sledgemapper.Api.Handlers
                 CampaignId = campaign.CampaignId
 
             };
-            Dbcontext.Sessions.Add(session);
-            await Dbcontext.SaveChangesAsync();
+            DbContext.Sessions.Add(session);
+            await DbContext.SaveChangesAsync(cancellationToken);
             return session.SessionId;
         }
     }

Sledgemapper.Api/Helpers/AppException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 
-namespace Sledgemapper.Helpers
+namespace Sledgemapper.Api.Helpers
 {
     // Custom exception class for throwing application specific exceptions (e.g. for validation) 
     // that can be caught and handled within the application

Sledgemapper.Api/Helpers/AutoMapperProfile.cs

@@ -2,7 +2,7 @@ using AutoMapper;
 using Sledgemapper.Entities;
 using Sledgemapper.Models.Users;
 
-namespace Sledgemapper.Helpers
+namespace Sledgemapper.Api.Helpers
 {
     public class AutoMapperProfile : Profile
     {

Sledgemapper.Api/Hubs/SledgemapperHub.cs

@@ -17,12 +17,10 @@ namespace Sledgemapper.Api.Hubs
     {
         private static readonly ConcurrentDictionary<Guid, string> UserColors = new();
         private readonly SledgemapperDbContext _dbContext;
-        // private readonly DataContext _datacontext;
 
         public SledgemapperHub(SledgemapperDbContext dbContext/*, DataContext datacontext*/)
         {
             _dbContext = dbContext;
-            // _datacontext = datacontext;
         }
 
         // other colors
@@ -136,7 +134,7 @@ namespace Sledgemapper.Api.Hubs
         public async Task UpdatePosition(string sessionName, Guid sessionId, Tile tile)
         {
             var userId = new Guid(Context.User.Claims.FirstOrDefault(m => m.Type == "Id").Value);
-            var SessionUsers = _dbContext.SessionUsers.Where(m => m.SessionId == sessionId).OrderBy(m => m.UserId).ToList();
+            var sessionUsers = _dbContext.SessionUsers.Where(m => m.SessionId == sessionId).OrderBy(m => m.UserId).ToList();
             var user = _dbContext.Users.First(u => u.Id == userId.ToString());
             var player = new Player { UserId = userId, Initials = user.Initials, Position = tile, Color = UserColors[userId] };
             await Clients.Group(sessionId.ToString()).PlayerUpdate(player);
@@ -148,7 +146,7 @@ namespace Sledgemapper.Api.Hubs
             var userConnection = new UserConnection { ConnectionId = Context.ConnectionId, UserId = userId };
             _dbContext.UserConnections.Add(userConnection);
             await _dbContext.SaveChangesAsync();
-            var availableColor = Colors.Where(m => !UserColors.Values.Contains(m)).First();
+            var availableColor = Colors.First(m => !UserColors.Values.Contains(m));
             UserColors.AddOrUpdate(userId, availableColor, (key, oldValue) => availableColor);
             await base.OnConnectedAsync();
         }
@@ -156,11 +154,11 @@ namespace Sledgemapper.Api.Hubs
         public override async Task OnDisconnectedAsync(Exception exception)
         {
             var userConnection = _dbContext.UserConnections.FirstOrDefault(m => m.ConnectionId == Context.ConnectionId);
-            var userId = userConnection.UserId;
             if (userConnection != null)
             {
+                var userId = userConnection.UserId;
+
                 _dbContext.UserConnections.Remove(userConnection);
-            }
 
                 var userSessions = _dbContext.SessionUsers.Where(m => m.UserId == userId).ToList();
                 {
@@ -175,7 +173,7 @@ namespace Sledgemapper.Api.Hubs
                 await _dbContext.SaveChangesAsync();
 
                 await base.OnDisconnectedAsync(exception);
-
+            }
         }
     }
 }

Sledgemapper.Api/Models/AuthResult.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Sledgemapper.Models.Users
+namespace Sledgemapper.Api.Models
 {
     public class AuthResult
     {

Sledgemapper.Api/Models/AuthenticateModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Models.Users
+namespace Sledgemapper.Api.Models
 {
     public class AuthenticateModel
     {

Sledgemapper.Api/Models/RegisterModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Models.Users
+namespace Sledgemapper.Api.Models
 {
     public class RegisterModel
     {

Sledgemapper.Api/Models/RegistrationResponse.cs

@@ -1,4 +1,6 @@
-namespace Sledgemapper.Models.Users
+using Sledgemapper.Models.Users;
+
+namespace Sledgemapper.Api.Models
 {
     public class RegistrationResponse : AuthResult
     {

Sledgemapper.Api/Models/UserLoginRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Sledgemapper.Models.Users
+namespace Sledgemapper.Api.Models
 {
     public class UserLoginRequest
     {

Sledgemapper.Shared/Clients/ISledgemapperClient.cs

@@ -1,8 +1,7 @@
 using Sledgemapper.Shared.Entities;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Sledgemapper.Clients
+namespace Sledgemapper.Shared.Clients
 {
     public interface ISledgemapperClient
     {

Sledgemapper.Shared/ExtensionMethods.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Sledgemapper.Api.Hubs
+namespace Sledgemapper.Shared
 {
     public static class ExtensionMethods
     {

Sledgemapper.Shared/ObservableConcurrentDictionary.cs

@@ -8,8 +8,10 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Threading;
 using System.Diagnostics;
+using System.Collections;
+using System.Collections.Concurrent;
 
-namespace System.Collections.Concurrent
+namespace Sledgemapper.Shared
 {
     /// <summary>
     /// Provides a thread-safe dictionary for use with data binding.

Sledgemapper.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sledgemapper/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Sledgemapper/CommunicationManager.cs

@@ -1,7 +1,3 @@
-using Microsoft.AspNetCore.SignalR.Client;
-using Polly;
-using Refit;
-using Sledgemapper.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,20 +6,21 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using Polly;
+using Refit;
+using Sledgemapper.Shared.Entities;
 
 namespace Sledgemapper
 {
     public class CommunicationManager
     {
-        public IMapApi Api { get; private set; }
-        public HubConnection Connection { get; private set; }
+        private readonly ChannelsQueue _queue = new();
         public readonly Session SessionData;
-        private readonly ChannelsQueue Queue = new();
         private AuthenticateResponse _authenticateResponse;
 
         public CommunicationManager(Session sessionData)
         {
-
 #if DEBUG
             var baseAddress = "http://localhost:5000";
 #else
@@ -33,11 +30,8 @@ namespace Sledgemapper
             SessionData = sessionData;
             Connection = new HubConnectionBuilder()
                 .WithAutomaticReconnect()
-                                       
-                                       .WithUrl($"{baseAddress}/SledgemapperHub", options =>
-                                        {
-                                            options.AccessTokenProvider = () => Task.FromResult(_authenticateResponse.Token);
-                                        })
+                .WithUrl($"{baseAddress}/SledgemapperHub",
+                    options => { options.AccessTokenProvider = () => Task.FromResult(_authenticateResponse.Token); })
                 .Build();
 
             Api = RestService.For<IMapApi>(
@@ -47,59 +41,44 @@ namespace Sledgemapper
                 }
             );
 
-            Connection.On<Session>("UpdateMap", (map) =>
+            Connection.On<Session>("UpdateMap", map =>
             {
                 SessionData.Map = map.Map;
                 SessionData.Walls = map.Walls;
                 SessionData.Overlays = map.Overlays;
             });
 
-            Connection.On<Player>("PlayerUpdate", (player) =>
+            Connection.On<Player>("PlayerUpdate", player =>
             {
                 var p = SessionData.Players.FirstOrDefault(m => m.UserId == player.UserId);
                 if (p != null)
-                {
                     p.Position = player.Position;
-                }
                 else
-                {
                     SessionData.Players.Add(player);
-                }
             });
 
-            Connection.On<Tile>("DeleteTile", (tile) =>
-            {
-                SessionData.Map.Remove(tile.ToString(), out var _);
-            });
+            Connection.On<Tile>("DeleteTile", tile => { SessionData.Map.Remove(tile.ToString(), out var _); });
 
-            Connection.On<Wall>("DeleteWall", (tile) =>
-           {
-               SessionData.Walls.Remove(tile.ToString(), out var _);
-           });
+            Connection.On<Wall>("DeleteWall", tile => { SessionData.Walls.Remove(tile.ToString(), out var _); });
 
-            Connection.On<Note>("DeleteNote", (tile) =>
-          {
-              SessionData.Notes.Remove(tile.ToString(), out var _);
-          });
+            Connection.On<Note>("DeleteNote", tile => { SessionData.Notes.Remove(tile.ToString(), out var _); });
 
-            Connection.On<Overlay>("DeleteOverlay", (tile) =>
-           {
-               SessionData.Overlays.Remove(tile.ToString(), out var _);
-           });
+            Connection.On<Overlay>("DeleteOverlay",
+                tile => { SessionData.Overlays.Remove(tile.ToString(), out var _); });
 
-            Connection.On<Tile>("NewTile", (tile) =>
+            Connection.On<Tile>("NewTile", tile =>
             {
                 SessionData.Map.Remove(tile.ToString(), out var _);
                 SessionData.Map.TryAdd(tile.ToString(), tile);
             });
 
-               Connection.On<Room>("NewRoom", (room) =>
+            Connection.On<Room>("NewRoom", room =>
             {
                 SessionData.Rooms.Remove(room.ToString(), out var _);
                 SessionData.Rooms.TryAdd(room.ToString(), room);
             });
 
-               Connection.On<Line>("NewLine", (line) =>
+            Connection.On<Line>("NewLine", line =>
             {
                 SessionData.Lines.Remove(line.ToString(), out var _);
                 SessionData.Lines.TryAdd(line.ToString(), line);
@@ -108,39 +87,35 @@ namespace Sledgemapper
             Connection.On("RefreshPlayers", () =>
             {
                 if (!string.IsNullOrWhiteSpace(State.Instance.MapName))
-             {
-                 Connection?.SendAsync("UpdatePosition", State.Instance.MapName, State.Instance.MapId, SessionData.Players.First(p => p.UserId == new Guid(_authenticateResponse.Id)));
-             }
+                    Connection?.SendAsync("UpdatePosition", State.Instance.MapName, State.Instance.MapId,
+                        SessionData.Players.First(p => p.UserId == new Guid(_authenticateResponse.Id)));
             });
 
-            Connection.On<Player>("RemovePlayer", (player) =>
+            Connection.On<Player>("RemovePlayer", player =>
             {
                 var p = SessionData.Players.FirstOrDefault(m => m.UserId == player.UserId);
-             if (p != null)
-             {
-                 SessionData.Players.Remove(p);
-             }
+                if (p != null) SessionData.Players.Remove(p);
             });
 
-            Connection.On<Wall>("NewWall", (tile) =>
+            Connection.On<Wall>("NewWall", tile =>
             {
                 SessionData.Walls.Remove(tile.ToString(), out var _);
                 SessionData.Walls.TryAdd(tile.ToString(), tile);
             });
 
-            Connection.On<Overlay>("NewOverlay", (tile) =>
+            Connection.On<Overlay>("NewOverlay", tile =>
             {
                 SessionData.Overlays.Remove(tile.ToString(), out var _);
                 SessionData.Overlays.TryAdd(tile.ToString(), tile);
             });
 
-            Connection.On<Note>("NewNote", (note) =>
+            Connection.On<Note>("NewNote", note =>
             {
                 //SessionData.Notes.Remove(note.ToString(), out var _);
                 SessionData.Notes.AddOrUpdate(note.ToString(), note, (key, oldnote) => note);
             });
 
-            Connection.On<Player>("NewPlayer", (player) =>
+            Connection.On<Player>("NewPlayer", player =>
             {
                 var p = SessionData.Players.FirstOrDefault(m => m.UserId == player.UserId);
                 if (p is null)
@@ -154,41 +129,11 @@ namespace Sledgemapper
                 }
             });
 
-            Connection.On<Ping>("Ping", (ping) =>
-            {
-                SessionData.Pings.TryAdd(Guid.NewGuid(), ping);
-            });
+            Connection.On<Ping>("Ping", ping => { SessionData.Pings.TryAdd(Guid.NewGuid(), ping); });
         }
 
-       
-
-        private Task<string> GetToken()
-        {
-            return Task.FromResult(_authenticateResponse.Token);
-        }
-
-        public async Task<IMapApi.AuthResult> Register(RegisterModel registerModel)
-        {
-            var result = await Api.Register(registerModel).ConfigureAwait(false);
-            return result;
-        }
-
-        public async Task<AuthenticateResponse> Login(AuthenticateModel authenticateModel)
-        {
-            _authenticateResponse = await Api.Authenticate(authenticateModel).ConfigureAwait(false);
-            return _authenticateResponse;
-        }
-
-        private async Task Execute(Func<Task> call)
-        {
-            await Policy
-                      .Handle<ApiException>(ex => ex.StatusCode == HttpStatusCode.RequestTimeout)
-
-                      .RetryForeverAsync()
-                      //.RetryAsync(Polly.RetrySyntax., async (exception, retryCount) => await Task.Delay(500))
-                      .ExecuteAsync(async () => await call().ConfigureAwait(false))
-                      .ConfigureAwait(false);
-        }
+        public IMapApi Api { get; }
+        public HubConnection Connection { get; }
 
         public void Enqueue(BaseMapEntity entity, TileAction action)
         {
@@ -198,64 +143,112 @@ namespace Sledgemapper
                     switch (entity)
                     {
                         case Tile tile:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewTile(tile, State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewTile(tile, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Overlay overlay:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewOverlay(overlay,State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewOverlay(overlay, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Wall wall:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewWall(wall, State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewWall(wall, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Note note:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewNote(note, State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewNote(note, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Room room:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewRoom(room, State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewRoom(room, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Line line:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.NewLine(line, State.Instance.CampaignId, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.NewLine(line, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                     }
+
                     break;
 
                 case TileAction.Delete:
                     switch (entity)
                     {
                         case Tile tile:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.DeleteTile(tile, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.DeleteTile(tile, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Overlay overlay:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.DeleteOverlay(overlay, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.DeleteOverlay(overlay, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Wall wall:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.DeleteWall(wall, State.Instance.MapId).ConfigureAwait(false)));
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.DeleteWall(wall, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                         case Note note:
-                            Queue.Enqueue(async () => await Execute(async () => await Api.DeleteNote(note, State.Instance.MapId).ConfigureAwait(false)));
-                            break;
-                    }
+                            _queue.Enqueue(async () => await Execute(async () =>
+                                await Api.DeleteNote(note, State.Instance.CampaignId, State.Instance.MapId)
+                                    .ConfigureAwait(false)));
                             break;
                     }
 
+                    break;
+            }
+        }
+
+        private async Task Execute(Func<Task> call)
+        {
+            await Policy
+                .Handle<ApiException>(ex => ex.StatusCode == HttpStatusCode.RequestTimeout)
+                .RetryForeverAsync()
+                //.RetryAsync(Polly.RetrySyntax., async (exception, retryCount) => await Task.Delay(500))
+                .ExecuteAsync(async () => await call().ConfigureAwait(false))
+                .ConfigureAwait(false);
+        }
+
+
+        private Task<string> GetToken()
+        {
+            return Task.FromResult(_authenticateResponse.Token);
+        }
+
+        public async Task<AuthenticateResponse> Login(AuthenticateModel authenticateModel)
+        {
+            _authenticateResponse = await Api.Authenticate(authenticateModel).ConfigureAwait(false);
+            return _authenticateResponse;
         }
 
         internal async Task Ping(Tile location)
         {
-            if (Connection!=null && Connection.State == HubConnectionState.Connected)
+            if (Connection is { State: HubConnectionState.Connected })
             {
                 await Connection.InvokeAsync("Ping", SessionData.SessionName, location);
             }
         }
+
+        public async Task<IMapApi.AuthResult> Register(RegisterModel registerModel)
+        {
+            var result = await Api.Register(registerModel).ConfigureAwait(false);
+            return result;
+        }
     }
 
-    class AuthenticatedHttpClientHandler : HttpClientHandler
+    internal class AuthenticatedHttpClientHandler : HttpClientHandler
     {
-        private readonly Func<Task<string>> getToken;
+        private readonly Func<Task<string>> _getToken;
 
         public AuthenticatedHttpClientHandler(Func<Task<string>> getToken)
         {
-            if (getToken == null) throw new ArgumentNullException(nameof(getToken));
-            this.getToken = getToken;
+            _getToken = getToken ?? throw new ArgumentNullException(nameof(getToken));
 
             //if (myConfigurationService.VerifySslCertificate == false)
             //{
@@ -264,19 +257,18 @@ namespace Sledgemapper
             //}
         }
 
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
+            CancellationToken cancellationToken)
         {
             // See if the request has an authorize header
             var auth = request.Headers.Authorization;
             if (auth != null)
             {
-                var token = await getToken().ConfigureAwait(false);
+                var token = await _getToken().ConfigureAwait(false);
                 request.Headers.Authorization = new AuthenticationHeaderValue(auth.Scheme, token);
             }
 
             return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
         }
-
-
     }
 }

Sledgemapper/IMapApi.cs

@@ -70,17 +70,17 @@ namespace Sledgemapper
 
       
 
-        [Delete("/session/{sessionName}/wall")]
-        Task DeleteWall([Body] Wall wall, Guid sessionName);
+        [Delete("/map/{campaignId}/{mapId}/wall")]
+        Task DeleteWall([Body] Wall wall, Guid campaignId, Guid mapId);
 
-        [Delete("/session/{sessionName}/tile")]
-        Task DeleteTile([Body] Tile tile, Guid sessionName);
+        [Delete("/map/{campaignId}/{mapId}/tile")]
+        Task DeleteTile([Body] Tile tile, Guid campaignId, Guid mapId);
 
-        [Delete("/session/{sessionName}/overlay")]
-        Task DeleteOverlay([Body] Overlay overlay, Guid sessionName);
+        [Delete("/map/{campaignId}/{mapId}/overlay")]
+        Task DeleteOverlay([Body] Overlay overlay, Guid campaignId, Guid mapId);
 
-        [Delete("/session/{sessionName}/note")]
-        Task DeleteNote([Body] Note overlay, Guid sessionName);
+        [Delete("/map/{campaignId}/{mapId}/note")]
+        Task DeleteNote([Body] Note overlay, Guid campaignId, Guid mapId);
 
 
         public class AuthResult

Sledgemapper/Settings.cs

@@ -14,7 +14,7 @@ namespace Sledgemapper
         public int TileDeleteDivider { get; set; }
         public int PingDuration {get;set;}
 
-        private static readonly Settings instance = new Settings();
+        private static readonly Settings instance = new ();
 
         // Explicit static constructor to tell C# compiler
         // not to mark type as beforefieldinit

Sledgemapper/State.cs

@@ -6,7 +6,7 @@ namespace Sledgemapper
 {
     public sealed class State
     {
-        private static readonly State instance = new State();
+        private static readonly State instance = new ();
 
         public Tile SelectedTile { get; set; }
         public Tile HoveredTile { get; set; }

Sledgemapper/UI/CampaignWindow.Custom.cs

@@ -1,4 +1,3 @@
-using Myra.Graphics2D.UI;
 using Sentry;
 using System;
 using TinyMessenger;

Sledgemapper/UI/MainWidget.Custom.cs

@@ -5,7 +5,6 @@ using Myra.Graphics2D.UI;
 using Myra.Graphics2D.UI.File;
 using Myra.Graphics2D.UI.Properties;
 using Newtonsoft.Json;
-using Sentry;
 using Sledgemapper.Messages;
 using Sledgemapper.Shared.Entities;
 using System;

Sledgemapper/UI/MapList.Custom.cs

@@ -2,7 +2,6 @@
 using Myra.Graphics2D.Brushes;
 using Myra.Graphics2D.UI;
 using Sledgemapper.Messages;
-using Sledgemapper.Shared.Entities;
 using System;
 using System.Threading.Tasks;
 using TinyMessenger;

Sledgemapper/UI/MapWindow.cs

@@ -1,7 +1,4 @@
 /* Generated by MyraPad at 02/09/2021 16:26:04 */
-using Myra.Graphics2D.UI;
-using Sentry;
-using System;
 
 namespace Sledgemapper.UI
 {

Sledgemapper/UI/NoteList.Custom.cs

@@ -1,7 +1,6 @@
 /* Generated by MyraPad at 01/12/2020 11:46:54 */
 using System.Linq;
 using Myra.Graphics2D.TextureAtlases;
-using Myra.Graphics2D.UI;
 using Sledgemapper.Messages;
 using Sledgemapper.Shared.Entities;
 using TinyMessenger;
@@ -22,7 +21,7 @@ namespace Sledgemapper.UI
             {
                 var note = CommunicationManager.SessionData.Notes.Values.ElementAt(i);
                 var item = new NoteListItem();
-                item.LblNoteText.Text = $"{note.ToString()} - {note.Text}";
+                item.LblNoteText.Text = $"{note} - {note.Text}";
                 item.BtnNoteCenter.Image = new TextureRegion(CachedContent.Instance.Location);
                 item.BtnNoteView.Image = new TextureRegion(CachedContent.Instance.Eye);
                 item.BtnNoteCenter.Click += (s, e) =>

Sledgemapper/UI/PlayerList.Custom.cs

@@ -1,5 +1,5 @@
 /* Generated by MyraPad at 28/08/2021 19:49:08 */
-using Myra.Graphics2D.UI;
+
 using System.Threading.Tasks;
 
 namespace Sledgemapper.UI