src/GameIdeas/Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs

@@ -13,12 +13,8 @@ public static class GameHelper
             throw new ArgumentNullException(nameof(authState), "Authentication state missing");
         }
 
-        var userId = authState.User.FindFirstValue(ClaimTypes.Sid);
+        var userId = authState.User.FindFirstValue(ClaimTypes.Sid) 
-
+            ?? throw new ArgumentNullException(nameof(authState), "user state missing");
-        if (userId == null)
-        {
-            throw new ArgumentNullException(nameof(authState), "user state missing");
-        }
 
         game.CreationUserId = userId;
         game.CreationDate = DateTime.Now;

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor

@@ -1,5 +1,5 @@
 @using GameIdeas.BlazorApp.Pages.Games
-@using GameIdeas.BlazorApp.Pages.User
+@using GameIdeas.BlazorApp.Pages.UserMenu
 @using GameIdeas.BlazorApp.Shared.Components.Select
 @using GameIdeas.BlazorApp.Shared.Components.Select.Models
 @using GameIdeas.BlazorApp.Shared.Models

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.cs

@@ -1,9 +1,9 @@
-using GameIdeas.BlazorApp.Pages.User.Gateways;
+using GameIdeas.BlazorApp.Pages.UserMenu.Gateways;
 using GameIdeas.Shared.Dto;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace GameIdeas.BlazorApp.Pages.User.Components;
+namespace GameIdeas.BlazorApp.Pages.UserMenu.Components;
 
 public partial class Login
 {

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/LoginValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
 using GameIdeas.Shared.Dto;
 
-namespace GameIdeas.BlazorApp.Pages.User.Components;
+namespace GameIdeas.BlazorApp.Pages.UserMenu.Components;
 
 public class LoginValidator : AbstractValidator<UserDto>
 {

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/AuthGateway.cs

@@ -5,7 +5,7 @@ using GameIdeas.Resources;
 using GameIdeas.Shared.Dto;
 using Microsoft.AspNetCore.Components.Authorization;
 
-namespace GameIdeas.BlazorApp.Pages.User.Gateways;
+namespace GameIdeas.BlazorApp.Pages.UserMenu.Gateways;
 
 public class AuthGateway(IHttpClientService httpClient,
     AuthenticationStateProvider stateProvider) : IAuthGateway

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/IAuthGateway.cs

@@ -1,6 +1,6 @@
 using GameIdeas.Shared.Dto;
 
-namespace GameIdeas.BlazorApp.Pages.User.Gateways;
+namespace GameIdeas.BlazorApp.Pages.UserMenu.Gateways;
 
 public interface IAuthGateway
 {

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor

@@ -1,4 +1,4 @@
-@using GameIdeas.BlazorApp.Pages.User.Components
+@using GameIdeas.BlazorApp.Pages.UserMenu.Components
 @using GameIdeas.BlazorApp.Shared.Components.BackdropFilter
 @using GameIdeas.BlazorApp.Shared.Constants
 @using GameIdeas.Shared.Constants

src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs

@@ -1,9 +1,7 @@
-using GameIdeas.BlazorApp.Pages.User.Gateways;
+using GameIdeas.BlazorApp.Pages.UserMenu.Gateways;
-using GameIdeas.BlazorApp.Services;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Authorization;
 
-namespace GameIdeas.BlazorApp.Pages.User;
+namespace GameIdeas.BlazorApp.Pages.UserMenu;
 
 public partial class UserMenu
 {

src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs

@@ -2,7 +2,7 @@ using System.Net.Http.Json;
 using Blazored.LocalStorage;
 using GameIdeas.BlazorApp;
 using GameIdeas.BlazorApp.Pages.Games.Gateways;
-using GameIdeas.BlazorApp.Pages.User.Gateways;
+using GameIdeas.BlazorApp.Pages.UserMenu.Gateways;
 using GameIdeas.BlazorApp.Services;
 using GameIdeas.Resources;
 using Microsoft.AspNetCore.Components.Authorization;