removed db stuff in signalR

Gabefire · Jun 12, 2024 · 00b209d · 00b209d
1 parent 8ef08df
commit 00b209d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 140 deletions.
diff --git a/TalkWaveApi.WebSocket/Hubs/ChatHub.cs b/TalkWaveApi.WebSocket/Hubs/ChatHub.cs
@@ -14,22 +14,8 @@ namespace TalkWaveApi.WebSocket.Hubs
     [Authorize]
     public class ChatHub : Hub
     {
-        private readonly DatabaseContext _context;
-        public ChatHub(DatabaseContext dbContext)
-        {
-            _context = dbContext;
-        }
         public async Task JoinGroup(string groupId)
         {
-            string? userId = Context.UserIdentifier;
-
-            if (!int.TryParse(userId, out int userParsedId))
-            {
-                Context.Abort();
-                return;
-            }
-
-            await ValidateChannel(groupId, userParsedId, Context);
             await Groups.AddToGroupAsync(Context.ConnectionId, groupId);
 
         }
@@ -40,59 +26,21 @@ public async Task LeaveGroup(string groupId)
         }
         public async Task SendMessage(string groupId, string message)
         {
-            string? userId = Context.UserIdentifier;
-            if (!int.TryParse(userId, out int userParsedId))
-            {
-                Context.Abort();
-                return;
-            }
-            User? user = await _context.Users.FindAsync(userParsedId);
-            if (user == null)
+            string? userEmail = Context.UserIdentifier;
+
+            if (userEmail == null)
             {
                 Context.Abort();
-                return;
             }
-
-            Message dbMessage = new()
-            {
-                UserId = userParsedId,
-                ChannelId = int.Parse(groupId),
-                Content = message,
-                CreatedAt = DateTime.UtcNow
-            };
-
             MessageDto messageDto = new()
             {
-                Author = user.UserName,
+                Author = userEmail,
                 Content = message,
                 CreatedAt = DateTime.UtcNow,
             };
-            await _context.Messages.AddAsync(dbMessage);
-            await _context.SaveChangesAsync();
-
-            await Clients.Group(groupId).SendAsync("ReceiveMessage", user.UserId, messageDto);
-        }
-        public async Task ValidateChannel(string Id, int UserId, HubCallerContext context)
-        {
-            //Validate Id can be casted as int
-            if (!int.TryParse(Id, out int ChannelId))
-            {
-                context.Abort();
-            }
 
-            //Validate channel exists
-            var channel = await _context.Channels.FindAsync(ChannelId);
-            if (channel == null)
-            {
-                context.Abort();
-            }
 
-            //Validate user is in channel
-            var userTest = await _context.ChannelUsersStatuses.Where(x => x.ChannelId == ChannelId).Where(x => x.UserId == UserId).FirstOrDefaultAsync();
-            if (userTest == null)
-            {
-                context.Abort();
-            }
+            await Clients.Group(groupId).SendAsync("ReceiveMessage", userEmail, messageDto);
         }
     };
 }

diff --git a/TalkWaveApi.WebSocket/Models/Channel.cs b/TalkWaveApi.WebSocket/Models/Channel.cs
diff --git a/TalkWaveApi.WebSocket/Models/ChannelUserStatus.cs b/TalkWaveApi.WebSocket/Models/ChannelUserStatus.cs
diff --git a/TalkWaveApi.WebSocket/Models/Message.cs b/TalkWaveApi.WebSocket/Models/Message.cs
diff --git a/TalkWaveApi.WebSocket/Models/User.cs b/TalkWaveApi.WebSocket/Models/User.cs
diff --git a/TalkWaveApi.WebSocket/Program.cs b/TalkWaveApi.WebSocket/Program.cs
@@ -17,7 +17,7 @@
 
 var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");
 
-builder.Services.AddSingleton<IUserIdProvider, UserIdProvider>();
+builder.Services.AddSingleton<IUserIdProvider, EmailBasedUserIdProvider>();
 
 builder.Services.AddCors(p => p.AddPolicy("dev", builder =>
 {
@@ -29,15 +29,6 @@
     builder.WithOrigins("https://talkwaveapp.com").AllowAnyMethod().AllowAnyHeader().AllowCredentials();
 }));
 
-
-builder.Services.AddDbContext<DatabaseContext>(options =>
-options.UseNpgsql(Configuration.GetConnectionString("DefaultConnection"), x =>
-{
-    x.EnableRetryOnFailure();
-}));
-
-builder.Services.AddDatabaseDeveloperPageExceptionFilter();
-
 builder.Services.AddHealthChecks();
 
 builder.Services.AddAuthentication(options =>
@@ -113,6 +104,6 @@ public class EmailBasedUserIdProvider : IUserIdProvider
 {
     public virtual string GetUserId(HubConnectionContext connection)
     {
-        return connection.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value!;
+        return connection.User?.FindFirst(ClaimTypes.Email)?.Value!;
     }
 }
diff --git a/TalkWaveApi.WebSocket/Services/UserIdProvider.cs b/TalkWaveApi.WebSocket/Services/UserIdProvider.cs
diff --git a/TalkWaveApi/Controllers/UserController.cs b/TalkWaveApi/Controllers/UserController.cs
@@ -131,6 +131,7 @@ private string CreateToken(User user)
         List<Claim> claims =
         [
             new(ClaimTypes.NameIdentifier, user.UserId.ToString()),
+            new(ClaimTypes.Email, user.Email),
         ];
 
         var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(