feat: remove user role requirement for game notice signalr hub

GZTimeWalker · GZTimeWalker · commit 108d75d43c41 · 2024-04-29T18:37:36.000+08:00
diff --git a/src/GZCTF/Hubs/UserHub.cs b/src/GZCTF/Hubs/UserHub.cs
@@ -12,7 +12,6 @@ public override async Task OnConnectedAsync()
         HttpContext? context = Context.GetHttpContext();
 
         if (context is null
-            || !await HubHelper.HasUser(context)
             || !context.Request.Query.TryGetValue("game", out StringValues gameId)
             || !int.TryParse(gameId, out var gId))
         {
diff --git a/src/GZCTF/Program.cs b/src/GZCTF/Program.cs
@@ -98,6 +98,7 @@
 #region Configuration
 
 if (!GZCTF.Program.IsTesting)
+{
     try
     {
         builder.Configuration.AddEntityConfiguration(options =>
@@ -116,7 +117,8 @@
                 builder.Configuration.GetConnectionString("Database") ?? "null"]);
         GZCTF.Program.ExitWithFatalMessage(
             GZCTF.Program.StaticLocalizer[nameof(GZCTF.Resources.Program.Database_ConnectionFailed), e.Message]);
-    }
+    }    
+}
 
 #endregion Configuration
 
@@ -406,21 +408,17 @@ public static void ExitWithFatalMessage(string msg)
 
         public static IActionResult InvalidModelStateHandler(ActionContext context)
         {
-            string? errors = null;
             var localizer = context.HttpContext.RequestServices.GetRequiredService<IStringLocalizer<Program>>();
             if (context.ModelState.ErrorCount <= 0)
-                return new JsonResult(
-                    new RequestResponse(errors is [_, ..]
-                        ? errors
-                        : localizer[nameof(Resources.Program.Model_ValidationFailed)]))
+                return new JsonResult(new RequestResponse(
+                        localizer[nameof(Resources.Program.Model_ValidationFailed)]))
                 { StatusCode = 400 };
 
-            errors = (from val in context.ModelState.Values
-                      where val.Errors.Count > 0
-                      select val.Errors.FirstOrDefault()?.ErrorMessage).FirstOrDefault();
-
-            return new JsonResult(new RequestResponse(errors is [_, ..]
-                ? errors
+            var error = context.ModelState.Values.Where(v => v.Errors.Count > 0)
+                .Select(v => v.Errors.FirstOrDefault()?.ErrorMessage).FirstOrDefault();
+            
+            return new JsonResult(new RequestResponse(error is [_, ..]
+                ? error
                 : localizer[nameof(Resources.Program.Model_ValidationFailed)]))
             { StatusCode = 400 };
         }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public override async Task OnConnectedAsync()`
`12`	`12`	`HttpContext? context = Context.GetHttpContext();`
`13`	`13`
`14`	`14`	`if (context is null`
`15`		`- \|\| !await HubHelper.HasUser(context)`
`16`	`15`	`\|\| !context.Request.Query.TryGetValue("game", out StringValues gameId)`
`17`	`16`	`\|\| !int.TryParse(gameId, out var gId))`
`18`	`17`	`{`