Fix NRE in ViewerPageDataProvider. (#571)

immense · Jan 20, 2023 · 97e31b4 · 97e31b4
1 parent c5a1a56
commit 97e31b4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs
@@ -21,8 +21,19 @@ public ViewerPageDataProvider(IDataService dataService, IApplicationConfig appCo
 
         public string GetUserDisplayName(PageModel pageModel)
         {
+            if (string.IsNullOrWhiteSpace(pageModel?.User?.Identity?.Name))
+            {
+                return string.Empty;
+            }
+
             var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name);
-            return user.UserOptions?.DisplayName ?? user.UserName;
+
+            if (user is null)
+            {
+                return string.Empty;
+            }
+
+            return user.UserOptions?.DisplayName ?? user.UserName ?? string.Empty;
         }
 
         public ViewerPageTheme GetTheme(PageModel pageModel)