template: Constrain generated TenantId SQL field size (#488)

adamskt · web-flow · commit 1b75edf0d555 · 2024-11-14T14:22:54.000-08:00
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Auth/UserInfo.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Auth/UserInfo.cs
@@ -14,6 +14,7 @@ public class UserInfo
     public required ICollection<string> Permissions { get; set; }
 #endif
 #if Tenancy
+    [MaxLength(36)]
     public string? TenantId { get; set; }
     public string? TenantName { get; set; }
 #endif
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/GlobalUsings.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/GlobalUsings.cs
@@ -10,7 +10,7 @@
 global using Coalesce.Starter.Vue.Data.Auth;
 global using Coalesce.Starter.Vue.Data.Coalesce;
 global using Coalesce.Starter.Vue.Data.Utilities;
-#if (Identity || ExampleModel)
+#if (Identity || ExampleModel || TrackingBase)
 global using Coalesce.Starter.Vue.Data.Models;
 #endif
 
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/AuditLog.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/AuditLog.cs
@@ -21,7 +21,7 @@ public class AuditLog : DefaultAuditLog
     // NOTE: Audit logs are *optionally* tenanted because they can log changes
     // to non-tenanted entities as well. Read security is implemented in the below datasource.
 
-    [InternalUse]
+    [InternalUse, MaxLength(36)]
     public string? TenantId { get; set; }
     [InternalUse]
     public Tenant? Tenant { get; set; }
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs
@@ -18,6 +18,7 @@ public class Role
 #if Tenancy
     [InternalUse]
     [DefaultOrderBy(FieldOrder = 0)]
+    [MaxLength(36)]
     public string TenantId { get; set; } = null!;
     [InternalUse]
     [ForeignKey(nameof(TenantId))]
@@ -62,6 +63,7 @@ public class RoleClaim : IdentityRoleClaim<string>, ITenanted
 
     [InternalUse]
     [DefaultOrderBy(FieldOrder = 0)]
+    [MaxLength(36)]
     public required string TenantId { get; set; }
     [InternalUse]
     [ForeignKey(nameof(TenantId))]
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/Tenant.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/Tenant.cs
@@ -12,6 +12,7 @@ namespace Coalesce.Starter.Vue.Data.Models;
 [Display(Name = "Organization")]
 public class Tenant
 {
+    [MaxLength(36)]
     public string TenantId { get; set; } = Guid.NewGuid().ToString();
 
     public required string Name { get; set; }
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/TenantMembership.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/TenantMembership.cs
@@ -4,6 +4,7 @@
 [InternalUse]
 public class TenantMembership : TenantedBase
 {
+    [MaxLength(36)]
     public string TenantMembershipId { get; set; } = Guid.NewGuid().ToString();
 
     [Required]
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/TenantedBase.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/TenantedBase.cs
@@ -7,7 +7,7 @@ public abstract class TenantedBase
     : ITenanted
 #endif
 {
-    [InternalUse, Required]
+    [InternalUse, Required, MaxLength(36)]
     public string TenantId { get; set; } = null!;
     [InternalUse]
     public Tenant? Tenant { get; set; }
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/UserRole.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/UserRole.cs
@@ -27,6 +27,7 @@ public string Id
 #if Tenancy
     [InternalUse]
     [DefaultOrderBy(FieldOrder = 0)]
+    [MaxLength(36)]
     public string TenantId { get; set; } = null!;
     [InternalUse]
     public Tenant? Tenant { get; set; }
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_Layout.cshtml b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_Layout.cshtml
@@ -1,6 +1,7 @@
-﻿@*#if (AppInsights)
+@*#if (AppInsights)
 @inject Microsoft.ApplicationInsights.AspNetCore.JavaScriptSnippet JavaScriptSnippet
 #endif*@
+@namespace Coalesce.Starter.Vue.Web.Pages
 
 <!DOCTYPE html>
 <html lang="en">
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs
@@ -14,6 +14,7 @@
 #if OpenAPI
 using Microsoft.OpenApi.Models;
 #endif
+using System.Security.Claims;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace Coalesce.Starter.Vue.Data.Models;`
`12`	`12`	`[Display(Name = "Organization")]`
`13`	`13`	`public class Tenant`
`14`	`14`	`{`
	`15`	`+ [MaxLength(36)]`
`15`	`16`	`public string TenantId { get; set; } = Guid.NewGuid().ToString();`
`16`	`17`
`17`	`18`	`public required string Name { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`[InternalUse]`
`5`	`5`	`public class TenantMembership : TenantedBase`
`6`	`6`	`{`
	`7`	`+ [MaxLength(36)]`
`7`	`8`	`public string TenantMembershipId { get; set; } = Guid.NewGuid().ToString();`
`8`	`9`
`9`	`10`	`[Required]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public abstract class TenantedBase`
`7`	`7`	`: ITenanted`
`8`	`8`	`#endif`
`9`	`9`	`{`
`10`		`- [InternalUse, Required]`
	`10`	`+ [InternalUse, Required, MaxLength(36)]`
`11`	`11`	`public string TenantId { get; set; } = null!;`
`12`	`12`	`[InternalUse]`
`13`	`13`	`public Tenant? Tenant { get; set; }`