Update email address automatically if not present in profile

src/dotnet/APIView/APIViewWeb/Controllers/AccountController.cs

@@ -5,7 +5,6 @@
 using APIViewWeb.Repositories;
 using APIViewWeb.Models;
 
-
 namespace APIViewWeb.Controllers
 {
     [AllowAnonymous]

src/dotnet/APIView/APIViewWeb/Managers/Interfaces/IUserProfileManager.cs

@@ -13,5 +13,6 @@ public interface IUserProfileManager
         public Task<UserProfileModel> TryGetUserProfileByNameAsync(string UserName);
         public Task UpdateUserPreferences(ClaimsPrincipal User, UserPreferenceModel preferences);
         public Task UpdateUserProfile(ClaimsPrincipal User, string email, HashSet<string> languages, UserPreferenceModel preferences);
+        public Task SetUserEmailIfNullOrEmpty(ClaimsPrincipal User);
     }
 }

src/dotnet/APIView/APIViewWeb/Managers/UserProfileManager.cs

@@ -3,12 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using APIView.Identity;
 using APIViewWeb.Models;
 using APIViewWeb.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Octokit;
 
 namespace APIViewWeb.Managers
 {
@@ -62,5 +63,20 @@ public async Task UpdateUserProfile(ClaimsPrincipal User, string email, HashSet<
 
             await _UserProfileRepository.UpsertUserProfileAsync(User, UserProfile);
         }
+
+        public async Task SetUserEmailIfNullOrEmpty(ClaimsPrincipal User)
+        {
+            var UserProfile = await TryGetUserProfileAsync(User);
+
+            if (string.IsNullOrWhiteSpace(UserProfile.Email))
+            {
+                var microsoftEmail = User.Claims.FirstOrDefault(c => c.Type == ClaimConstants.Email)?.Value;
+
+                if (!string.IsNullOrWhiteSpace(microsoftEmail))
+                {
+                    await UpdateUserProfile(User, microsoftEmail, null, null);
+                }
+            }
+        }
     }
 }

src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml.cs

@@ -59,6 +59,8 @@ public async Task OnGetAsync(
             IEnumerable<string> search, IEnumerable<string> languages, IEnumerable<string> state,
             IEnumerable<string> status, int pageNo=1, int pageSize=_defaultPageSize, string sortField=_defaultSortField)
         {
+            await _userProfileManager.SetUserEmailIfNullOrEmpty(User);
+
             if (!search.Any() && !languages.Any() && !state.Any() && !status.Any())
             {
                 UserPreferenceModel userPreference = await _preferenceCache.GetUserPreferences(User);

src/dotnet/APIView/APIViewWeb/Pages/Login.cshtml.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
@@ -17,4 +17,4 @@ public IActionResult OnGetAsync()
             return Page();
         }
     }
-}
+}