Fixes the results of the code-quality-bot's review

Author: JasonRobertFrancis

web/Areas/Directory/Controllers/DirectoryController.cs

@@ -58,6 +58,10 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         [HttpGet("search")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetFromQuery([FromQuery] string search, [FromQuery] bool ucd = false)
         {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
             if (string.IsNullOrWhiteSpace(search))
             {
                 return Ok(new List<IndividualSearchResult>());
@@ -104,11 +108,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                 results.Add(result);
 
                 var vmsearch = VMACSService.Search(result.LoginId);
-                var vm = vmsearch.Result;
-                if (vm != null && vm.item != null && vm.item.Nextel != null) result.Nextel = vm.item.Nextel[0];
-                if (vm != null && vm.item != null && vm.item.LDPager != null) result.LDPager = vm.item.LDPager[0];
-                if (vm != null && vm.item != null && vm.item.Unit != null) result.Department = vm.item.Unit[0];
-
+                PopulateVmacsDetails(result, vmsearch.Result);
             });
             return results;
         }
@@ -149,10 +149,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
                 results.Add(result);
 
                 var vmsearch = VMACSService.Search(result.LoginId);
-                var vm = vmsearch.Result;
-                if (vm != null && vm.item != null && vm.item.Nextel != null) result.Nextel = vm.item.Nextel[0];
-                if (vm != null && vm.item != null && vm.item.LDPager != null) result.LDPager = vm.item.LDPager[0];
-                if (vm != null && vm.item != null && vm.item.Unit != null) result.Department = vm.item.Unit[0];
+                PopulateVmacsDetails(result, vmsearch.Result);
             }
 
             return results;
@@ -169,6 +166,17 @@ public async Task<IActionResult> DirectoryResult(string mothraID)
             return await Task.Run(() => View("~/Areas/Directory/Views/UserInfo.cshtml"));
         }
 
+        private static void PopulateVmacsDetails(IndividualSearchResult result, VMACSQuery? vm)
+        {
+            if (vm?.item != null)
+            {
+                if (vm.item.Nextel != null) result.Nextel = vm.item.Nextel[0];
+                if (vm.item.LDPager != null) result.LDPager = vm.item.LDPager[0];
+                if (vm.item.Unit != null) result.Department = vm.item.Unit[0];
+            }
+        }
+
+        [NonAction]
         public override async Task OnActionExecutionAsync(ActionExecutingContext context,
                                                          ActionExecutionDelegate next)
         {

web/Areas/Directory/Controllers/UserInfoController.cs

@@ -78,7 +78,7 @@ public async Task<ActionResult> UserInfo(string? mothraID)
             {
                 // Check if user is viewing their own page
                 var currentUser = _userHelper.GetCurrentUser();
-                bool ownPage = mothraID == currentUser.MothraId;
+                bool ownPage = currentUser != null && mothraID == currentUser.MothraId;
                 var individual = await _aaud.AaudUsers.Where(u => (u.MothraId == mothraID)).FirstOrDefaultAsync();
                 string? iamId = null;
                 if (individual != null) iamId = individual.IamId;
@@ -142,6 +142,7 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
             return await Task.Run(() => nav);
         }
 
+        [NonAction]
         public override async Task OnActionExecutionAsync(ActionExecutingContext context,
                                                          ActionExecutionDelegate next)
         {

web/Areas/Directory/Services/UserInfoService.cs

@@ -92,7 +92,10 @@ public UserInfoService(
             await PopulateIDCardsAsync(result);
             await PopulateKeysAsync(result);
             await PopulateLoansAsync(result);
-            await PopulateInstinctInfoAsync(result, individual);
+            if (individual != null)
+            {
+                await PopulateInstinctInfoAsync(result, individual);
+            }
             await PopulateActiveDirectoryInfoAsync(result);
 
             return result;
@@ -1791,7 +1794,10 @@ private async Task<InstinctResult> GetInstinctUserAsync(string lastName, string
                         result.PasswordExpiresAt = matchedUser.PasswordExpiresAt;
                         result.Status = matchedUser.Status;
                         result.Username = matchedUser.Username;
-                        result.Roles = matchedUser.Roles?.Select(r => r.Label).ToList() ?? new List<string>();
+                        result.Roles = matchedUser.Roles?
+                            .Where(r => r.Label != null)
+                            .Select(r => r.Label!)
+                            .ToList() ?? new List<string>();
                         foundMatch = true;
                     }
                     if (!foundMatch)