Remove tenant name claim - Example7

JonPSmith · JonPSmith · commit d8abaa936784 · 2024-01-11T10:19:54.000Z
diff --git a/Example7.MvcWebApp.ShardingOnly/Controllers/HomeController.cs b/Example7.MvcWebApp.ShardingOnly/Controllers/HomeController.cs
@@ -8,8 +8,8 @@
 using Example7.MvcWebApp.ShardingOnly.PermissionsCode;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using System.Drawing;
 using AuthPermissions.AspNetCore.ShardingServices;
+using AuthPermissions.BaseCode.PermissionsCode;
 
 namespace Example7.MvcWebApp.ShardingOnly.Controllers
 {
@@ -26,7 +26,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/Example7.MvcWebApp.ShardingOnly/Example7CacheFileStore.Development.json b/Example7.MvcWebApp.ShardingOnly/Example7CacheFileStore.Development.json
@@ -1,7 +1,8 @@
 {
   "Cache": {
     "ShardingEntry-Tenant_1": "{\r\n  \"Name\": \"Tenant_1\",\r\n  \"DatabaseName\": \"Tenant_1\",\r\n  \"ConnectionName\": \"EastCoastServer\",\r\n  \"DatabaseType\": \"SqlServer\"\r\n}",
-    "ShardingEntry-Extra tenant-20230808101149": "{\r\n  \"Name\": \"Extra tenant-20230808101149\",\r\n  \"DatabaseName\": \"20230808101149-892\",\r\n  \"ConnectionName\": \"CentralServer\",\r\n  \"DatabaseType\": \"SqlServer\"\r\n}"
+    "ShardingEntry-Extra tenant-20230808101149": "{\r\n  \"Name\": \"Extra tenant-20230808101149\",\r\n  \"DatabaseName\": \"20230808101149-892\",\r\n  \"ConnectionName\": \"CentralServer\",\r\n  \"DatabaseType\": \"SqlServer\"\r\n}",
+    "ShardingEntry-SignOn-20240111091446-697": "{\r\n  \"Name\": \"SignOn-20240111091446-697\",\r\n  \"DatabaseName\": \"Db-20240111091446-697\",\r\n  \"ConnectionName\": \"CentralServer\",\r\n  \"DatabaseType\": \"SqlServer\"\r\n}"
   },
   "TimeOuts": {}
 }
diff --git a/Example7.MvcWebApp.ShardingOnly/Program.cs b/Example7.MvcWebApp.ShardingOnly/Program.cs
@@ -52,7 +52,6 @@
     //AuthP version 5 and above: Use this method to configure sharding
     .SetupMultiTenantSharding(new ShardingEntryOptions(false))
     .IndividualAccountsAuthentication()
-    .RegisterAddClaimToUser<AddTenantNameClaim>()
     .RegisterTenantChangeService<ShardingOnlyTenantChangeService>()
     .AddRolesPermissionsIfEmpty(Example7AppAuthSetupData.RolesDefinition)
     .AddAuthUsersIfEmpty(Example7AppAuthSetupData.UsersRolesDefinition)
diff --git a/Example7.MvcWebApp.ShardingOnly/Views/Shared/_CompanyLayout.cshtml b/Example7.MvcWebApp.ShardingOnly/Views/Shared/_CompanyLayout.cshtml
@@ -6,7 +6,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>
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ The AuthP is an open-source library under the MIT licence (and remain as a open-
 
 If you have already built your application using an older version, then you need to look at the following "how up update" documents
 
+- From Migrating from AuthPermissions.AspNetCore 3, 4, 5 to 6.1 see [UpdateToVersion620.md](https://github.com/JonPSmith/AuthPermissions.AspNetCore/blob/main/UpdateToVersion620.md). NOTE: you only need to do this if you are using the "Sign up for a new tenant, with versioning" (shortened to "Sign up Tenant") feature **AND** your multi-tenant uses [sharding](https://github.com/JonPSmith/AuthPermissions.AspNetCore/wiki/Sharding-explained).
 - From Migrating from AuthPermissions.AspNetCore 3, 4, 5 to 6.0 see [UpdateToVersion6.md](https://github.com/JonPSmith/AuthPermissions.AspNetCore/blob/main/UpdateToVersion5.md)
 - From Migrating from AuthPermissions.AspNetCore 2, 3 or 4.* to 5.0 see [UpdateToVersion5.md](https://github.com/JonPSmith/AuthPermissions.AspNetCore/blob/main/UpdateToVersion5.md)
 - From Migrating from AuthPermissions.AspNetCore 2.* to 3.0 see [UpdateToVersion3.md](https://github.com/JonPSmith/AuthPermissions.AspNetCore/blob/main/UpdateToVersion3.md)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"Cache": {`
`3`	`3`	`"ShardingEntry-Tenant_1": "{\r\n \"Name\": \"Tenant_1\",\r\n \"DatabaseName\": \"Tenant_1\",\r\n \"ConnectionName\": \"EastCoastServer\",\r\n \"DatabaseType\": \"SqlServer\"\r\n}",`
`4`		`- "ShardingEntry-Extra tenant-20230808101149": "{\r\n \"Name\": \"Extra tenant-20230808101149\",\r\n \"DatabaseName\": \"20230808101149-892\",\r\n \"ConnectionName\": \"CentralServer\",\r\n \"DatabaseType\": \"SqlServer\"\r\n}"`
	`4`	`+ "ShardingEntry-Extra tenant-20230808101149": "{\r\n \"Name\": \"Extra tenant-20230808101149\",\r\n \"DatabaseName\": \"20230808101149-892\",\r\n \"ConnectionName\": \"CentralServer\",\r\n \"DatabaseType\": \"SqlServer\"\r\n}",`
	`5`	`+ "ShardingEntry-SignOn-20240111091446-697": "{\r\n \"Name\": \"SignOn-20240111091446-697\",\r\n \"DatabaseName\": \"Db-20240111091446-697\",\r\n \"ConnectionName\": \"CentralServer\",\r\n \"DatabaseType\": \"SqlServer\"\r\n}"`
`5`	`6`	`},`
`6`	`7`	`"TimeOuts": {}`
`7`	`8`	`}`