Remove tenant name claim - Example3

JonPSmith · JonPSmith · commit 10576dd9e6b9 · 2024-01-11T10:20:13.000Z
diff --git a/Example3.MvcWebApp.IndividualAccounts/Controllers/HomeController.cs b/Example3.MvcWebApp.IndividualAccounts/Controllers/HomeController.cs
@@ -4,9 +4,10 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using AuthPermissions.SupportCode.AddUsersServices;
-using Example3.InvoiceCode.Services;
 using Example3.MvcWebApp.IndividualAccounts.PermissionsCode;
 using Microsoft.AspNetCore.Authorization;
+using System.Linq;
+using AuthPermissions.BaseCode.PermissionsCode;
 
 namespace Example3.MvcWebApp.IndividualAccounts.Controllers
 {
@@ -23,7 +24,7 @@ public IActionResult Index(string message)
         {
             ViewBag.Message = message;
 
-            if (AddTenantNameClaim.GetTenantNameFromUser(User) == null)
+            if (User.Claims.All(x => x.Type != PermissionConstants.DataKeyClaimType))
                 return View(new AppSummary());
 
             return RedirectToAction("Index", "Invoice");
diff --git a/Example3.MvcWebApp.IndividualAccounts/Program.cs b/Example3.MvcWebApp.IndividualAccounts/Program.cs
@@ -52,7 +52,6 @@
     //NOTE: This uses the same database as the individual accounts DB
     .UsingEfCoreSqlServer(connectionString)
     .IndividualAccountsAuthentication()
-    .RegisterAddClaimToUser<AddTenantNameClaim>()
     .RegisterAddClaimToUser<AddRefreshEveryMinuteClaim>()
     .RegisterTenantChangeService<InvoiceTenantChangeService>()
     .AddRolesPermissionsIfEmpty(Example3AppAuthSetupData.RolesDefinition)
diff --git a/Example3.MvcWebApp.IndividualAccounts/Views/Shared/_CompanyLayout.cshtml b/Example3.MvcWebApp.IndividualAccounts/Views/Shared/_CompanyLayout.cshtml
@@ -8,7 +8,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]  - @AddTenantNameClaim.GetTenantNameFromUser(User)</title>
+    @* <title>@ViewData["Title"]  - @AddTenantNameClaim.GetTenantNameFromUser(User)</title> *@
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
