Clean up

App_Start/Extensions/Extensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -33,7 +34,12 @@ public static Task LogOn(this PeopleService.UserInfo @this)
             return loggingInfo.LogOn(remember: mobile);
         }
 
-
+        public static async Task<PeopleService.UserInfo> LoadUser(this ClaimsPrincipal principal)
+        {
+            var email = Context.Current.User().GetEmail();
+            if (email.IsEmpty()) return null;
+            return await Context.Current.Database().FirstOrDefault<PeopleService.UserInfo>(x => x.Email == email);
+        }
 
         private static void TryAddJwtToken(GenericLoginInfo loggingInfo, bool mobile)
         {

Controllers/Modules/Components/Footer.cs

@@ -5,6 +5,7 @@
 using Olive;
 using Olive.Mvc;
 using vm = ViewModel;
+using System;
 
 namespace ViewComponents
 {
@@ -20,10 +21,10 @@ public Footer(IThemeProvider themeProvider)
 
 		public async Task<IViewComponentResult> InvokeAsync(vm.Footer info)
 		{
-			var email = Context.Current.User().GetEmail();
-
-			var user = await Context.Current.Database().FirstOrDefault<PeopleService.UserInfo>(x => x.Email == email);
+			var user = await Context.Current.User().LoadUser();
+            var email = Context.Current.User().GetEmail();
             if (user is null) return Content("User not recognised: " + email);
+
             var userRoles = user.Roles.Split(',');
 
 			var sidebarProfileUrl = await _themeProvider.GetSidebarProfileUrl(userRoles, new Dictionary<string, string>

Controllers/Modules/Components/UserProfile.cs

@@ -5,6 +5,7 @@
 using Olive;
 using Olive.Mvc;
 using vm = ViewModel;
+using System;
 
 namespace ViewComponents
 {
@@ -20,9 +21,8 @@ public UserProfile(IThemeProvider themeProvider)
 
         public async Task<IViewComponentResult> InvokeAsync(vm.UserProfile info)
         {
+            var user = await Context.Current.User().LoadUser();
             var email = Context.Current.User().GetEmail();
-
-            var user = await Context.Current.Database().FirstOrDefault<PeopleService.UserInfo>(x => x.Email == email);
             if (user is null) return Content("User not recognised: " + email);
 
             var userRoles = user.Roles.Split(',');

Controllers/Pages/Unauthorized.Controller.cs

@@ -23,6 +23,7 @@
 using vm = ViewModel;
 using Olive.Microservices.Hub;
 using ViewModel;
+using Microsoft.AspNetCore.Authentication;
 
 namespace Controllers
 {
@@ -40,6 +41,12 @@ public async Task<ActionResult> Index(Guid? feature)
             if (item != null && User.Identity?.IsAuthenticated == true)
             {
                 if (User.CanSee(item)) return Redirect(item.LoadUrl);
+
+                if (await Context.Current.User().LoadUser() is null)
+                {
+                    await HttpContext.SignOutAsync();
+                    return Content("Invalid user: " + HttpContext.User.GetEmail());
+                }
             }
 
             Response.StatusCode = User.Identity?.IsAuthenticated == true ? 403 : 401;

Olive.Microservices.Hub.csproj

@@ -8,7 +8,7 @@
 		<Authors>Geeks Ltd</Authors>
 		<RepositoryUrl>https://github.com/Geeksltd/Olive.Microservices.Hub/tree/master/Olive.Microservices.Hub</RepositoryUrl>
 		<PackageIcon>icon.png</PackageIcon>
-		<Version>1.5.48</Version>
+		<Version>1.5.49</Version>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
 		<Nullable>warnings</Nullable>