From 8455033e522e68e61e319cfec104acba2a6d0d45 Mon Sep 17 00:00:00 2001
From: XShine555 <xshine555@gmail.com>
Date: Fri, 29 May 2026 22:37:32 +0200
Subject: [PATCH] Use if condition

---
 WebApi/Authentication/CurrentUser.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebApi/Authentication/CurrentUser.cs b/WebApi/Authentication/CurrentUser.cs
index 0809fe4..1f198da 100644
--- a/WebApi/Authentication/CurrentUser.cs
+++ b/WebApi/Authentication/CurrentUser.cs
@@ -12,7 +12,8 @@ public sealed class CurrentUser : IBindableFromHttpContext<CurrentUser>
         IsAuthenticated = isAuthenticated.HasValue && isAuthenticated.Value;
 
         var rawId = principal.FindFirstValue(ClaimTypes.NameIdentifier);
-        Id = Guid.TryParse(rawId, out var id)? id : null;
+        if (Guid.TryParse(rawId, out var id) && id != Guid.Empty)
+            Id = id;
 
         Username = principal.FindFirstValue(ClaimTypes.Name);
         FirstName = principal.FindFirstValue(ClaimTypes.GivenName);