From 97e31b44fc9741d671a930effeff4b6ed876cc18 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Fri, 20 Jan 2023 07:32:36 -0800 Subject: [PATCH] Fix NRE in ViewerPageDataProvider. (#571) --- .../RcImplementations/ViewerPageDataProvider.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs index a5c6d5e4..e8ce62fb 100644 --- a/Server/Services/RcImplementations/ViewerPageDataProvider.cs +++ b/Server/Services/RcImplementations/ViewerPageDataProvider.cs @@ -21,8 +21,19 @@ namespace Remotely.Server.Services.RcImplementations 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)