+ You have been invited to join the @Model.Tenant.Name organization. You will join as @User.GetUserName(). +
+ + + + + + +} \ No newline at end of file diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/Invitation.cshtml.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/Invitation.cshtml.cs new file mode 100644 index 000000000..7fc5455fa --- /dev/null +++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/Invitation.cshtml.cs @@ -0,0 +1,76 @@ +using Coalesce.Starter.Vue.Data; +using Coalesce.Starter.Vue.Data.Auth; +using Coalesce.Starter.Vue.Data.Models; +using IntelliTect.Coalesce.Models; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using System.ComponentModel.DataAnnotations; + +#nullable disable + +namespace Coalesce.Starter.Vue.Web.Pages +{ + [Authorize] + public class InvitationModel( + InvitationService invitationService, + SignInManager+ +@*#if (TenantCreateSelf)*@ + +@*#endif*@ + + diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SelectTenant.cshtml.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SelectTenant.cshtml.cs new file mode 100644 index 000000000..e61d41b7a --- /dev/null +++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SelectTenant.cshtml.cs @@ -0,0 +1,57 @@ +using Coalesce.Starter.Vue.Data; +using Coalesce.Starter.Vue.Data.Auth; +using Coalesce.Starter.Vue.Data.Models; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata; + +namespace Coalesce.Starter.Vue.Web.Pages +{ + [Authorize] + public class SelectTenantModel(AppDbContext db) : PageModel + { + [BindProperty(SupportsGet = true)] + public string? ReturnUrl { get; set; } + + public List
- signInManager) : PageModel
+ {
+ public async Task OnGet()
+ {
+ await signInManager.SignOutAsync();
+ return Redirect("/");
+ }
+
+ public async Task OnPost()
+ {
+ await signInManager.SignOutAsync();
+ return Redirect("/");
+ }
+ }
+}
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
new file mode 100644
index 000000000..eae1264ae
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_Layout.cshtml
@@ -0,0 +1,57 @@
+@*#if (AppInsights)
+@inject Microsoft.ApplicationInsights.AspNetCore.JavaScriptSnippet JavaScriptSnippet
+#endif*@
+
+
+
+
+
+
+ @ViewData["Title"]
+
+
+
+ @*#if (AppInsights)
+ @Html.Raw(JavaScriptSnippet.FullScript)
+ #endif*@
+
+
+
+
+ ("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Warning);
+ .AddConsole()
+ // Filter out Request Starting/Request Finished noise:
+ .AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Warning);
builder.Configuration
- .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
- .AddJsonFile("appsettings.localhost.json", optional: true, reloadOnChange: true)
- .AddEnvironmentVariables();
+ .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+ .AddJsonFile("appsettings.localhost.json", optional: true, reloadOnChange: true)
+ .AddEnvironmentVariables();
#region Configure Services
@@ -46,36 +50,37 @@
b.ConnectionString = builder.Configuration["ApplicationInsights:ConnectionString"];
});
services.AddSingleton();
-services.ConfigureTelemetryModule((module, o) => {
- module.EnableSqlCommandTextInstrumentation = true;
+services.ConfigureTelemetryModule((module, o) =>
+{
+ module.EnableSqlCommandTextInstrumentation = true;
});
-// App insights filters all logs to Warning by default.
+// App insights filters all logs to Warning by default. We want to include our own logging.
builder.Logging.AddFilter("Coalesce.Starter.Vue", LogLevel.Information);
#endif
services.AddDbContext(options => options
- .UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection"), opt => opt
- .EnableRetryOnFailure()
- .UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery)
- )
- // Ignored because it interferes with the construction of Coalesce IncludeTrees via .Include()
- .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.NavigationBaseIncludeIgnored))
+ .UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection"), opt => opt
+ .EnableRetryOnFailure()
+ .UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery)
+ )
+ // Ignored because it interferes with the construction of Coalesce IncludeTrees via .Include()
+ .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.NavigationBaseIncludeIgnored))
);
services.AddCoalesce();
services.AddDataProtection()
- .PersistKeysToDbContext();
+ .PersistKeysToDbContext();
services
- .AddMvc()
- .AddJsonOptions(options =>
- {
- options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
- options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
- options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
- });
+ .AddMvc()
+ .AddJsonOptions(options =>
+ {
+ options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+ options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
+ options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+ });
#if Identity
builder.ConfigureAuthentication();
@@ -84,14 +89,27 @@
#if OpenAPI
services.AddSwaggerGen(c =>
{
- c.AddCoalesce();
- c.SwaggerDoc("current", new OpenApiInfo { Title = "Current API", Version = "current" });
+ c.AddCoalesce();
+ c.SwaggerDoc("current", new OpenApiInfo { Title = "Current API", Version = "current" });
});
#endif
services.AddScoped();
+#if TenantMemberInvites
+// Register IUrlHelper to allow for invite link generation.
+services.AddSingleton();
+services.AddScoped(x =>
+{
+ var actionContext = x.GetRequiredService().ActionContext;
+ var factory = x.GetRequiredService();
+ return factory.GetUrlHelper(actionContext!);
+});
+
+services.AddScoped();
+#endif
+
#endregion
@@ -101,32 +119,32 @@
if (app.Environment.IsDevelopment())
{
- app.UseDeveloperExceptionPage();
-
- app.UseViteDevelopmentServer(c =>
- {
- c.DevServerPort = 5002;
- });
-
- app.MapCoalesceSecurityOverview("coalesce-security");
-
- #if (!Identity)
- // TODO: Dummy authentication for initial development.
- // Replace this with a proper authentication scheme like
- // Windows Authentication, or an OIDC provider, or something else.
- // If you wanted to use ASP.NET Core Identity, you're recommended
- // to keep the "--Identity" parameter to the Coalesce template enabled.
- app.Use(async (context, next) =>
- {
- Claim[] claims = [new Claim(ClaimTypes.Name, "developmentuser")];
-
- var identity = new ClaimsIdentity(claims, "dummy-auth");
- context.User = new ClaimsPrincipal(identity);
-
- await next.Invoke();
- });
- // End Dummy Authentication.
- #endif
+ app.UseDeveloperExceptionPage();
+
+ app.UseViteDevelopmentServer(c =>
+ {
+ c.DevServerPort = 5002;
+ });
+
+ app.MapCoalesceSecurityOverview("coalesce-security");
+
+#if (!Identity)
+ // TODO: Dummy authentication for initial development.
+ // Replace this with a proper authentication scheme like
+ // Windows Authentication, or an OIDC provider, or something else.
+ // If you wanted to use ASP.NET Core Identity, you're recommended
+ // to keep the "--Identity" parameter to the Coalesce template enabled.
+ app.Use(async (context, next) =>
+ {
+ Claim[] claims = [new Claim(ClaimTypes.Name, "developmentuser")];
+
+ var identity = new ClaimsIdentity(claims, "dummy-auth");
+ context.User = new ClaimsPrincipal(identity);
+
+ await next.Invoke();
+ });
+ // End Dummy Authentication.
+#endif
}
app.UseAuthentication();
@@ -135,30 +153,30 @@
var containsFileHashRegex = new Regex(@"[.-][0-9a-zA-Z-_]{8}\.[^\.]*$", RegexOptions.Compiled);
app.UseStaticFiles(new StaticFileOptions
{
- OnPrepareResponse = ctx =>
- {
- // vite puts 8-char hashes before the file extension.
- // Use this to determine if we can send a long-term cache duration.
- if (containsFileHashRegex.IsMatch(ctx.File.Name))
- {
- ctx.Context.Response.GetTypedHeaders().CacheControl = new() { Public = true, MaxAge = TimeSpan.FromDays(30) };
- }
- }
+ OnPrepareResponse = ctx =>
+ {
+ // vite puts 8-char hashes before the file extension.
+ // Use this to determine if we can send a long-term cache duration.
+ if (containsFileHashRegex.IsMatch(ctx.File.Name))
+ {
+ ctx.Context.Response.GetTypedHeaders().CacheControl = new() { Public = true, MaxAge = TimeSpan.FromDays(30) };
+ }
+ }
});
// For all requests that aren't to static files, disallow caching by default.
// Individual endpoints may override this.
app.Use(async (context, next) =>
{
- context.Response.GetTypedHeaders().CacheControl = new() { NoCache = true, NoStore = true };
- await next();
+ context.Response.GetTypedHeaders().CacheControl = new() { NoCache = true, NoStore = true };
+ await next();
});
#if OpenAPI
app.MapSwagger();
app.UseSwaggerUI(c =>
{
- c.SwaggerEndpoint("/swagger/current/swagger.json", "Current API");
+ c.SwaggerEndpoint("/swagger/current/swagger.json", "Current API");
});
#endif
@@ -177,16 +195,16 @@
// Initialize/migrate database.
using (var scope = app.Services.CreateScope())
{
- var serviceScope = scope.ServiceProvider;
+ var serviceScope = scope.ServiceProvider;
- // Run database migrations.
- using var db = serviceScope.GetRequiredService();
- db.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
+ // Run database migrations.
+ using var db = serviceScope.GetRequiredService();
+ db.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
#if KeepTemplateOnly
- db.Database.EnsureDeleted();
- db.Database.EnsureCreated();
+ db.Database.EnsureDeleted();
+ db.Database.EnsureCreated();
#else
- db.Database.Migrate();
+ db.Database.Migrate();
#endif
new DatabaseSeeder(db).Seed();
}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/ProgramAuth.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/ProgramAuth.cs
deleted file mode 100644
index e1c49021b..000000000
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/ProgramAuth.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-using Coalesce.Starter.Vue.Data.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.IdentityModel.Protocols.OpenIdConnect;
-using System.Data;
-using System.Security.Claims;
-using System.Security.Cryptography;
-
-namespace Coalesce.Starter.Vue.Data.Auth;
-
-public static class ProgramAuth
-{
- public static void ConfigureAuthentication(this WebApplicationBuilder builder)
- {
- var config = builder.Configuration;
-
- builder.Services
- .AddIdentity()
- .AddEntityFrameworkStores()
- .AddDefaultTokenProviders()
- .AddClaimsPrincipalFactory();
-
- builder.Services
- .AddAuthentication()
-#if GoogleAuth
- .AddGoogle(options =>
- {
- options.ClientId = config["Authentication:Google:ClientId"]!;
- options.ClientSecret = config["Authentication:Google:ClientSecret"]!;
- options.ClaimActions.MapJsonKey("hd", "hd"); // Hosted domain (i.e. GSuite domain).
-#if UserPictures
- options.ClaimActions.MapJsonKey("pictureUrl", "picture");
-#endif
-
- options.Events.OnTicketReceived = OnTicketReceived(async (user, db, ctx) =>
- {
- // OPTIONAL: Populate fields on `user` specific to Google, if any.
-
- // NOTE: If needed, the GSuite domain (if any) of the user can be acquired as follows:
- //var domain = ctx.Principal!.FindFirstValue("hd")
-#if UserPictures
- // Populate or update user photo from Google
- await UpdateUserPhoto(user, db, ctx.Options.Backchannel,
- () => new HttpRequestMessage(HttpMethod.Get, ctx.Principal!.FindFirstValue("pictureUrl")));
-#endif
- });
- })
-#endif
-#if MicrosoftAuth
- .AddMicrosoftAccount(options =>
- {
- options.ClientId = config["Authentication:Microsoft:ClientId"]!;
- options.ClientSecret = config["Authentication:Microsoft:ClientSecret"]!;
-#if UserPictures
- options.SaveTokens = true;
-#endif
-
- options.Events.OnTicketReceived = OnTicketReceived(async (user, db, ctx) =>
- {
- // OPTIONAL: Populate additional fields on `user` specific to Microsoft, if any.
-
- // NOTE: If needed, the Entra/AAD TenantID of the user can be acquired as follows:
- //var tenantId = new JwtSecurityTokenHandler()
- // .ReadJwtToken(ctx.Properties!.GetTokenValue(OpenIdConnectParameterNames.AccessToken))
- // .Claims.First(c => c.Type == "tid").Value;
-
-#if UserPictures
- // Populate or update user photo from Microsoft Graph
- await UpdateUserPhoto(user, db, ctx.Options.Backchannel, () => {
- var request = new HttpRequestMessage(HttpMethod.Get, "https://graph.microsoft.com/v1.0/me/photos/96x96/$value");
- request.Headers.Authorization = new("Bearer", ctx.Properties!.GetTokenValue(OpenIdConnectParameterNames.AccessToken));
- return request;
- });
-#endif
- });
- })
-#endif
- ;
-
- builder.Services.Configure(o =>
- {
- // Configure how often to refresh user claims and validate
- // that the user is still allowed to sign in.
- o.ValidationInterval = TimeSpan.FromMinutes(5);
- });
-
- builder.Services.ConfigureApplicationCookie(c =>
- {
- c.LoginPath = "/sign-in"; // Razor page "Pages/SignIn.cshtml"
- });
- }
-
-#if UserPictures
- private static async Task UpdateUserPhoto(User user, AppDbContext db, HttpClient client, Func requestFactory)
- {
- UserPhoto? photo = user.Photo = db.UserPhotos.Where(p => p.UserId == user.Id).FirstOrDefault();
- if (photo is not null && photo.ModifiedOn >= DateTimeOffset.Now.AddDays(-7))
- {
- // User photo already populated and reasonably recent.
- return;
- }
-
- var request = requestFactory();
-
- if (request.RequestUri is null) return;
-
- try
- {
- var response = await client.SendAsync(request);
- if (!response.IsSuccessStatusCode) return;
-
- byte[] content = await response.Content.ReadAsByteArrayAsync();
-
- if (content is not { Length: > 0 }) return;
-
- if (photo is null)
- {
- user.Photo = photo = new UserPhoto { UserId = user.Id, Content = content };
- }
- else
- {
- photo.Content = content;
- photo.SetTracking(user.Id);
- }
- user.PhotoMD5 = MD5.HashData(content);
- }
- catch { /* Failure is non-critical */ }
- }
-#endif
-
-#if (GoogleAuth || MicrosoftAuth)
- private static Func OnTicketReceived(
- Func? updateUser = null
- ) => async (TicketReceivedContext ctx) =>
- {
- var db = ctx.HttpContext.RequestServices.GetRequiredService();
- var signInManager = ctx.HttpContext.RequestServices.GetRequiredService>();
-
- var (user, remoteLoginInfo) = await GetOrCreateUser(ctx, db, signInManager);
- if (user is null)
- {
- await Results.Text("Forbidden", statusCode: StatusCodes.Status403Forbidden).ExecuteAsync(ctx.HttpContext);
- ctx.HandleResponse();
- return;
- }
-
- if (updateUser is not null) await updateUser(user, db, ctx);
-
- await signInManager.UserManager.UpdateAsync(user);
-
- // ExternalLoginSignInAsync checks that the user isn't locked out.
- var result = await signInManager.ExternalLoginSignInAsync(
- remoteLoginInfo.LoginProvider,
- remoteLoginInfo.ProviderKey,
- isPersistent: true,
- bypassTwoFactor: true);
-
- if (!result.Succeeded)
- {
- await Results.Text("Forbidden", statusCode: StatusCodes.Status403Forbidden).ExecuteAsync(ctx.HttpContext);
- ctx.HandleResponse();
- return;
- }
-
- ctx.HttpContext.Response.Redirect(ctx.ReturnUri ?? "/");
- ctx.HandleResponse();
- };
-
- private static async Task<(User? user, UserLoginInfo remoteLoginInfo)> GetOrCreateUser(
- TicketReceivedContext ctx,
- AppDbContext db,
- SignInManager signInManager
- )
- {
- var remoteProvider = ctx.Scheme.Name;
- var remoteUser = ctx.Principal!;
- var remoteUserId = remoteUser.FindFirstValue(ClaimTypes.NameIdentifier)!;
- var remoteUserEmail = remoteUser.FindFirstValue(ClaimTypes.Email);
-
- var remoteLoginInfo = new UserLoginInfo(remoteProvider, remoteUserId, ctx.Scheme.DisplayName);
-
- // Find by the external user ID
- bool foundByLogin = false;
- User? user = await signInManager.UserManager.FindByLoginAsync(remoteProvider, remoteUserId);
-
- // If not found, look for an existing user by email address
- if (user is not null)
- {
- foundByLogin = true;
- }
- else if (remoteUserEmail is not null)
- {
- user = await signInManager.UserManager.FindByEmailAsync(remoteUserEmail);
- // Don't match existing users by email if the email isn't confirmed.
- if (user?.EmailConfirmed == false) user = null;
- }
-
- if (user is null)
- {
- if (!await CanUserSignUpAsync(ctx, db, remoteUser))
- {
- return (null, remoteLoginInfo);
- }
-
- user = new User { UserName = remoteUserEmail };
-
- // If this user is the first user, give them all roles so there is an initial admin.
- if (!db.Users.Any())
- {
- user.UserRoles = db.Roles.Select(r => new UserRole { Role = r, User = user }).ToList();
- }
-
- await signInManager.UserManager.CreateAsync(user);
- }
-
- if (!foundByLogin)
- {
- await signInManager.UserManager.AddLoginAsync(user, remoteLoginInfo);
- }
-
- user.FullName = remoteUser.FindFirstValue(ClaimTypes.Name) ?? user.FullName;
- user.Email = remoteUserEmail ?? user.Email;
- user.EmailConfirmed = true;
- // OPTIONAL: Update any other properties on the user as desired.
-
- return (user, remoteLoginInfo);
- }
-
- private static Task CanUserSignUpAsync(TicketReceivedContext ctx, AppDbContext db, ClaimsPrincipal remoteUser)
- {
- // OPTIONAL: Examine the properties of `remoteUser` and determine if they're permitted to sign up.
- return Task.FromResult(true);
- }
-
-#endif
-}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package-lock.json b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package-lock.json
index 7288379cf..a2f1af210 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package-lock.json
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package-lock.json
@@ -10,8 +10,8 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^6.6.0",
"@vueuse/core": "^11.0.3",
- "coalesce-vue": "5.0.0",
- "coalesce-vue-vuetify3": "5.0.0",
+ "coalesce-vue": "5.0.1",
+ "coalesce-vue-vuetify3": "5.0.1",
"typeface-roboto": "1.1.13",
"vue": "^3.5.0",
"vue-router": "^4.4.3",
@@ -821,9 +821,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
- "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+ "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
"cpu": [
"arm"
],
@@ -834,9 +834,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
- "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+ "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
"cpu": [
"arm64"
],
@@ -847,9 +847,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
- "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+ "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
"cpu": [
"arm64"
],
@@ -860,9 +860,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
- "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+ "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
"cpu": [
"x64"
],
@@ -873,9 +873,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
- "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+ "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
"cpu": [
"arm"
],
@@ -886,9 +886,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
- "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+ "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
"cpu": [
"arm"
],
@@ -899,9 +899,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
- "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+ "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
"cpu": [
"arm64"
],
@@ -912,9 +912,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
- "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+ "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
"cpu": [
"arm64"
],
@@ -925,9 +925,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
- "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+ "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
"cpu": [
"ppc64"
],
@@ -938,9 +938,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
- "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+ "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
"cpu": [
"riscv64"
],
@@ -951,9 +951,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
- "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+ "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
"cpu": [
"s390x"
],
@@ -964,9 +964,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
- "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+ "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
"cpu": [
"x64"
],
@@ -977,9 +977,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
- "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+ "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
"cpu": [
"x64"
],
@@ -990,9 +990,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
- "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+ "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
"cpu": [
"arm64"
],
@@ -1003,9 +1003,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
- "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+ "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
"cpu": [
"ia32"
],
@@ -1016,9 +1016,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
- "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+ "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
"cpu": [
"x64"
],
@@ -1949,9 +1949,9 @@
}
},
"node_modules/coalesce-vue": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/coalesce-vue/-/coalesce-vue-5.0.0.tgz",
- "integrity": "sha512-9PgBfetmP5XJNwehjk4noU0p8oWdJ8Jl7lnXRezaNQAfhB0Co757+INQlDVipCw8VmYg40IW1zDTKH9E/R5DIA==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/coalesce-vue/-/coalesce-vue-5.0.1.tgz",
+ "integrity": "sha512-CAIifw14NiqSicuWART/t4U/yDG8LrRzmNbA+RLrmaF289CiQ5gyJuNxZC3tLuyWgexB0EysbRli3pq7LVp/Cw==",
"dependencies": {
"@types/lodash-es": "^4.17.3",
"axios": "^1.3.4",
@@ -1969,9 +1969,9 @@
}
},
"node_modules/coalesce-vue-vuetify3": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/coalesce-vue-vuetify3/-/coalesce-vue-vuetify3-5.0.0.tgz",
- "integrity": "sha512-RFngKY8/lVgsSoPN1+Y1jdkEKI00sUBrGTArtPX69BpGpvBQxDN+Ctx/kmN90HhlLNwqpF2Sr5gTTSGV4Yc90Q==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/coalesce-vue-vuetify3/-/coalesce-vue-vuetify3-5.0.1.tgz",
+ "integrity": "sha512-OkXGQmiEsFxdawkKaDwQqIQN8B4Km73JpGH+kFecrwb7vz3hyEQ0OfQRUon6sKBPHjaIFhU3U1cMmp9HdBbz8A==",
"dependencies": {
"date-fns": "^3.0.0",
"date-fns-tz": "^3.0.0",
@@ -1981,7 +1981,7 @@
"vue-router": "^4.4.1"
},
"peerDependencies": {
- "coalesce-vue": "5.0.0",
+ "coalesce-vue": "5.0.1",
"vue": "^3.4.0",
"vuetify": "^3.7.1"
}
@@ -4072,9 +4072,9 @@
}
},
"node_modules/rollup": {
- "version": "4.21.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
- "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
+ "version": "4.22.4",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+ "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
"dev": true,
"dependencies": {
"@types/estree": "1.0.5"
@@ -4087,22 +4087,22 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.21.2",
- "@rollup/rollup-android-arm64": "4.21.2",
- "@rollup/rollup-darwin-arm64": "4.21.2",
- "@rollup/rollup-darwin-x64": "4.21.2",
- "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
- "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
- "@rollup/rollup-linux-arm64-gnu": "4.21.2",
- "@rollup/rollup-linux-arm64-musl": "4.21.2",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
- "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
- "@rollup/rollup-linux-s390x-gnu": "4.21.2",
- "@rollup/rollup-linux-x64-gnu": "4.21.2",
- "@rollup/rollup-linux-x64-musl": "4.21.2",
- "@rollup/rollup-win32-arm64-msvc": "4.21.2",
- "@rollup/rollup-win32-ia32-msvc": "4.21.2",
- "@rollup/rollup-win32-x64-msvc": "4.21.2",
+ "@rollup/rollup-android-arm-eabi": "4.22.4",
+ "@rollup/rollup-android-arm64": "4.22.4",
+ "@rollup/rollup-darwin-arm64": "4.22.4",
+ "@rollup/rollup-darwin-x64": "4.22.4",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+ "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+ "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+ "@rollup/rollup-linux-arm64-musl": "4.22.4",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+ "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+ "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+ "@rollup/rollup-linux-x64-gnu": "4.22.4",
+ "@rollup/rollup-linux-x64-musl": "4.22.4",
+ "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+ "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+ "@rollup/rollup-win32-x64-msvc": "4.22.4",
"fsevents": "~2.3.2"
}
},
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package.json b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package.json
index 4650a0830..5427bcca6 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package.json
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/package.json
@@ -15,8 +15,8 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^6.6.0",
"@vueuse/core": "^11.0.3",
- "coalesce-vue": "5.0.0",
- "coalesce-vue-vuetify3": "5.0.0",
+ "coalesce-vue": "5.0.1",
+ "coalesce-vue-vuetify3": "5.0.1",
"typeface-roboto": "1.1.13",
"vue": "^3.5.0",
"vue-router": "^4.4.3",
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/App.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/App.vue
index 8d977b636..a8f279483 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/App.vue
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/App.vue
@@ -4,7 +4,10 @@
- Coalesce Vue Template
+ Coalesce.Starter.Vue
+
+ — {{ $userInfo.tenantName }}
+
@@ -25,6 +28,7 @@
+
-
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/api-clients.g.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/api-clients.g.ts
index 49b4268b6..8b0889875 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/api-clients.g.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/api-clients.g.ts
@@ -17,6 +17,20 @@ export class RoleApiClient extends ModelApiClient<$models.Role> {
}
+export class TenantApiClient extends ModelApiClient<$models.Tenant> {
+ constructor() { super($metadata.Tenant) }
+ public create(name: string | null, adminEmail: string | null, $config?: AxiosRequestConfig): AxiosPromise> {
+ const $method = this.$metadata.methods.create
+ const $params = {
+ name,
+ adminEmail,
+ }
+ return this.$invoke($method, $params, $config)
+ }
+
+}
+
+
export class UserApiClient extends ModelApiClient<$models.User> {
constructor() { super($metadata.User) }
public getPhoto(id: string | null, etag?: string | null, $config?: AxiosRequestConfig): AxiosPromise> {
@@ -28,6 +42,23 @@ export class UserApiClient extends ModelApiClient<$models.User> {
return this.$invoke($method, $params, $config)
}
+ public evict(id: string | null, $config?: AxiosRequestConfig): AxiosPromise> {
+ const $method = this.$metadata.methods.evict
+ const $params = {
+ id,
+ }
+ return this.$invoke($method, $params, $config)
+ }
+
+ public inviteUser(email: string | null, role?: $models.Role | null, $config?: AxiosRequestConfig): AxiosPromise> {
+ const $method = this.$metadata.methods.inviteUser
+ const $params = {
+ email,
+ role,
+ }
+ return this.$invoke($method, $params, $config)
+ }
+
}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/components/HelloWorld.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/components/HelloWorld.vue
index 03334791d..4626a2cff 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/components/HelloWorld.vue
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/components/HelloWorld.vue
@@ -51,10 +51,100 @@
+ +
+
+
+
+
+
+
+
+
+
+
+
+
-
- Development Environment Recommended Tooling:
-
+ Quick Links
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Development Recommended Tooling:
@@ -161,50 +251,6 @@
-
-
-
- Quick Links
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts
index 7156cba45..7a0d4f324 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts
@@ -7,7 +7,10 @@ import { isAxiosError } from "axios";
import App from "./App.vue";
import router from "./router";
-import { globalProperties as userServiceProps } from "./user-service";
+import {
+ refreshUserInfo,
+ globalProperties as userServiceProps,
+} from "./user-service";
// Import global CSS and Fonts:
import "typeface-roboto";
@@ -68,6 +71,7 @@ CoalesceAxiosClient.interceptors.response.use(undefined, (error) => {
/* Never resolving promise so failure doesn't momentarily propagate to UI before reload completes */
});
}
+ return Promise.reject(error);
});
// SETUP: coalesce-vue-vuetify
@@ -79,7 +83,6 @@ const coalesceVuetify = createCoalesceVuetify({
// SETUP: app insights
//@ts-expect-error AppInsights imported from backend JavaScriptSnippet; no types available.
window.appInsights?.addTelemetryInitializer(function (envelope) {
- debugger;
if (
envelope.baseType === "ExceptionData" &&
// Filter out unactionable, junk errors:
@@ -102,4 +105,12 @@ app.use(router);
app.use(vuetify);
app.use(coalesceVuetify);
-app.mount("#app");
+refreshUserInfo()
+ .then(() => {
+ app.mount("#app");
+ })
+ .catch((e) => {
+ alert(
+ "Unable to contact the application server. Please refresh the page to try again.",
+ );
+ });
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/metadata.g.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/metadata.g.ts
index 4e00a4d7b..c3d0316a1 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/metadata.g.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/metadata.g.ts
@@ -184,6 +184,14 @@ export const AuditLog = domain.types.AuditLog = {
methods: {
},
dataSources: {
+ tenantedDataSource: {
+ type: "dataSource",
+ name: "TenantedDataSource" as const,
+ displayName: "Tenanted Data Source",
+ isDefault: true,
+ props: {
+ },
+ },
},
}
export const AuditLogProperty = domain.types.AuditLogProperty = {
@@ -298,11 +306,99 @@ export const Role = domain.types.Role = {
dataSources: {
},
}
+export const Tenant = domain.types.Tenant = {
+ name: "Tenant" as const,
+ displayName: "Organization",
+ get displayProp() { return this.props.name },
+ type: "model",
+ controllerRoute: "Tenant",
+ get keyProp() { return this.props.tenantId },
+ behaviorFlags: 2 as BehaviorFlags,
+ props: {
+ tenantId: {
+ name: "tenantId",
+ displayName: "Tenant Id",
+ type: "string",
+ role: "primaryKey",
+ hidden: 3 as HiddenAreas,
+ },
+ name: {
+ name: "name",
+ displayName: "Name",
+ type: "string",
+ role: "value",
+ rules: {
+ required: val => (val != null && val !== '') || "Name is required.",
+ }
+ },
+ externalId: {
+ name: "externalId",
+ displayName: "External Id",
+ description: "The external origin of this tenant. Other users who sign in with accounts from this external source will automatically join this organization.",
+ type: "string",
+ role: "value",
+ dontSerialize: true,
+ },
+ },
+ methods: {
+ create: {
+ name: "create",
+ displayName: "Create",
+ transportType: "item",
+ httpMethod: "POST",
+ isStatic: true,
+ params: {
+ name: {
+ name: "name",
+ displayName: "Org Name",
+ type: "string",
+ role: "value",
+ rules: {
+ required: val => (val != null && val !== '') || "Org Name is required.",
+ }
+ },
+ adminEmail: {
+ name: "adminEmail",
+ displayName: "Admin Email",
+ type: "string",
+ subtype: "email",
+ role: "value",
+ rules: {
+ required: val => (val != null && val !== '') || "Admin Email is required.",
+ }
+ },
+ },
+ return: {
+ name: "$return",
+ displayName: "Result",
+ type: "void",
+ role: "value",
+ },
+ },
+ },
+ dataSources: {
+ defaultSource: {
+ type: "dataSource",
+ name: "DefaultSource" as const,
+ displayName: "Default Source",
+ isDefault: true,
+ props: {
+ },
+ },
+ globalAdminSource: {
+ type: "dataSource",
+ name: "GlobalAdminSource" as const,
+ displayName: "Global Admin Source",
+ props: {
+ },
+ },
+ },
+}
export const User = domain.types.User = {
name: "User" as const,
displayName: "User",
description: "A user profile within the application.",
- get displayProp() { return this.props.id },
+ get displayProp() { return this.props.fullName },
type: "model",
controllerRoute: "User",
get keyProp() { return this.props.id },
@@ -314,15 +410,6 @@ export const User = domain.types.User = {
type: "string",
role: "value",
},
- photoMD5: {
- name: "photoMD5",
- displayName: "Photo MD5",
- type: "binary",
- base64: true,
- role: "value",
- hidden: 3 as HiddenAreas,
- dontSerialize: true,
- },
userName: {
name: "userName",
displayName: "User Name",
@@ -334,21 +421,23 @@ export const User = domain.types.User = {
displayName: "Email",
type: "string",
role: "value",
+ dontSerialize: true,
},
- lockoutEnd: {
- name: "lockoutEnd",
- displayName: "Lockout End",
- description: "If set, the user will be blocked from signing in until this date.",
- type: "date",
- dateKind: "datetime",
+ emailConfirmed: {
+ name: "emailConfirmed",
+ displayName: "Email Confirmed",
+ type: "boolean",
role: "value",
+ dontSerialize: true,
},
- lockoutEnabled: {
- name: "lockoutEnabled",
- displayName: "Lockout Enabled",
- description: "If enabled, the user can be locked out.",
- type: "boolean",
+ photoHash: {
+ name: "photoHash",
+ displayName: "Photo Hash",
+ type: "binary",
+ base64: true,
role: "value",
+ hidden: 3 as HiddenAreas,
+ dontSerialize: true,
},
userRoles: {
name: "userRoles",
@@ -373,18 +462,30 @@ export const User = domain.types.User = {
get nearForeignKey() { return (domain.types.UserRole as ModelType & { name: "UserRole" }).props.userId as ForeignKeyProperty },
get nearNavigationProp() { return (domain.types.UserRole as ModelType & { name: "UserRole" }).props.user as ModelReferenceNavigationProperty },
},
+ hidden: 3 as HiddenAreas,
dontSerialize: true,
},
- effectivePermissions: {
- name: "effectivePermissions",
- displayName: "Effective Permissions",
- description: "A summary of the effective permissions of the user, derived from their current roles.",
- type: "string",
- subtype: "multiline",
+ roleNames: {
+ name: "roleNames",
+ displayName: "Roles",
+ type: "collection",
+ itemType: {
+ name: "$collectionItem",
+ displayName: "",
+ role: "value",
+ type: "string",
+ },
role: "value",
- hidden: 1 as HiddenAreas,
dontSerialize: true,
},
+ isGlobalAdmin: {
+ name: "isGlobalAdmin",
+ displayName: "Is Global Admin",
+ description: "Global admins can perform some administrative actions against ALL tenants.",
+ type: "boolean",
+ role: "value",
+ hidden: 3 as HiddenAreas,
+ },
id: {
name: "id",
displayName: "Id",
@@ -415,7 +516,7 @@ export const User = domain.types.User = {
displayName: "Etag",
type: "binary",
role: "value",
- get source() { return (domain.types.User as ModelType & { name: "User" }).props.photoMD5 },
+ get source() { return (domain.types.User as ModelType & { name: "User" }).props.photoHash },
},
},
return: {
@@ -425,8 +526,72 @@ export const User = domain.types.User = {
role: "value",
},
},
+ evict: {
+ name: "evict",
+ displayName: "Evict",
+ transportType: "item",
+ httpMethod: "POST",
+ params: {
+ id: {
+ name: "id",
+ displayName: "Primary Key",
+ type: "string",
+ role: "value",
+ get source() { return (domain.types.User as ModelType & { name: "User" }).props.id },
+ rules: {
+ required: val => (val != null && val !== '') || "Primary Key is required.",
+ }
+ },
+ },
+ return: {
+ name: "$return",
+ displayName: "Result",
+ type: "void",
+ role: "value",
+ },
+ },
+ inviteUser: {
+ name: "inviteUser",
+ displayName: "Invite User",
+ transportType: "item",
+ httpMethod: "POST",
+ isStatic: true,
+ params: {
+ email: {
+ name: "email",
+ displayName: "Email",
+ type: "string",
+ subtype: "email",
+ role: "value",
+ rules: {
+ required: val => (val != null && val !== '') || "Email is required.",
+ }
+ },
+ role: {
+ name: "role",
+ displayName: "Role",
+ type: "model",
+ get typeDef() { return (domain.types.Role as ModelType & { name: "Role" }) },
+ role: "value",
+ },
+ },
+ return: {
+ name: "$return",
+ displayName: "Result",
+ type: "void",
+ role: "value",
+ },
+ },
},
dataSources: {
+ defaultSource: {
+ type: "dataSource",
+ name: "DefaultSource" as const,
+ displayName: "Default Source",
+ isDefault: true,
+ props: {
+ },
+ },
},
}
export const UserRole = domain.types.UserRole = {
@@ -666,6 +831,18 @@ export const UserInfo = domain.types.UserInfo = {
},
role: "value",
},
+ tenantId: {
+ name: "tenantId",
+ displayName: "Tenant Id",
+ type: "string",
+ role: "value",
+ },
+ tenantName: {
+ name: "tenantName",
+ displayName: "Tenant Name",
+ type: "string",
+ role: "value",
+ },
},
}
export const SecurityService = domain.services.SecurityService = {
@@ -702,6 +879,7 @@ interface AppDomain extends Domain {
AuditLog: typeof AuditLog
AuditLogProperty: typeof AuditLogProperty
Role: typeof Role
+ Tenant: typeof Tenant
User: typeof User
UserInfo: typeof UserInfo
UserRole: typeof UserRole
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/models.g.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/models.g.ts
index 3494b6b4b..bba5220e5 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/models.g.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/models.g.ts
@@ -59,6 +59,14 @@ export class AuditLog {
Object.assign(this, AuditLog.map(data || {}));
}
}
+export namespace AuditLog {
+ export namespace DataSources {
+
+ export class TenantedDataSource implements DataSource {
+ readonly $metadata = metadata.AuditLog.dataSources.tenantedDataSource
+ }
+ }
+}
export interface AuditLogProperty extends Model {
@@ -117,21 +125,57 @@ export class Role {
}
+export interface Tenant extends Model {
+ tenantId: string | null
+ name: string | null
+
+ /** The external origin of this tenant. Other users who sign in with accounts from this external source will automatically join this organization. */
+ externalId: string | null
+}
+export class Tenant {
+
+ /** Mutates the input object and its descendents into a valid Tenant implementation. */
+ static convert(data?: Partial): Tenant {
+ return convertToModel(data || {}, metadata.Tenant)
+ }
+
+ /** Maps the input object and its descendents to a new, valid Tenant implementation. */
+ static map(data?: Partial): Tenant {
+ return mapToModel(data || {}, metadata.Tenant)
+ }
+
+ static [Symbol.hasInstance](x: any) { return x?.$metadata === metadata.Tenant; }
+
+ /** Instantiate a new Tenant, optionally basing it on the given data. */
+ constructor(data?: Partial | {[k: string]: any}) {
+ Object.assign(this, Tenant.map(data || {}));
+ }
+}
+export namespace Tenant {
+ export namespace DataSources {
+
+ export class DefaultSource implements DataSource {
+ readonly $metadata = metadata.Tenant.dataSources.defaultSource
+ }
+
+ export class GlobalAdminSource implements DataSource {
+ readonly $metadata = metadata.Tenant.dataSources.globalAdminSource
+ }
+ }
+}
+
+
export interface User extends Model {
fullName: string | null
- photoMD5: string | null
userName: string | null
email: string | null
-
- /** If set, the user will be blocked from signing in until this date. */
- lockoutEnd: Date | null
-
- /** If enabled, the user can be locked out. */
- lockoutEnabled: boolean | null
+ emailConfirmed: boolean | null
+ photoHash: string | null
userRoles: UserRole[] | null
+ roleNames: string[] | null
- /** A summary of the effective permissions of the user, derived from their current roles. */
- effectivePermissions: string | null
+ /** Global admins can perform some administrative actions against ALL tenants. */
+ isGlobalAdmin: boolean | null
id: string | null
}
export class User {
@@ -153,6 +197,14 @@ export class User {
Object.assign(this, User.map(data || {}));
}
}
+export namespace User {
+ export namespace DataSources {
+
+ export class DefaultSource implements DataSource {
+ readonly $metadata = metadata.User.dataSources.defaultSource
+ }
+ }
+}
export interface UserRole extends Model {
@@ -231,6 +283,8 @@ export interface UserInfo extends Model {
fullName: string | null
roles: string[] | null
permissions: string[] | null
+ tenantId: string | null
+ tenantName: string | null
}
export class UserInfo {
@@ -263,6 +317,7 @@ declare module "coalesce-vue/lib/model" {
AuditLog: AuditLog
AuditLogProperty: AuditLogProperty
Role: Role
+ Tenant: Tenant
User: User
UserInfo: UserInfo
UserRole: UserRole
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts
index 4d04197da..155ccc05f 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts
@@ -6,7 +6,7 @@ import {
CAdminAuditLogPage,
//#endif
} from "coalesce-vue-vuetify3";
-//#if Identity
+//#if (Identity && AuditLogs)
import { Permission } from "./models.g";
//#endif
@@ -15,7 +15,6 @@ const router = createRouter({
routes: [
{
path: "/",
- name: "home",
component: () => import("./views/Home.vue"),
},
//#if ExampleModel
@@ -28,9 +27,16 @@ const router = createRouter({
//#endif
{
path: "/admin",
- name: "admin",
component: () => import("./views/Admin.vue"),
},
+ //#if Identity
+ {
+ path: "/user/:id",
+ alias: "/admin/User/edit/:id", // Override coalesce admin page
+ props: true,
+ component: () => import("./views/UserProfile.vue"),
+ },
+ // #endif
// Coalesce admin routes
{
@@ -49,7 +55,9 @@ const router = createRouter({
{
path: "/admin/audit",
component: titledAdminPage(CAdminAuditLogPage),
+ //#if Identity
meta: { permissions: [Permission.ViewAuditLogs] },
+ //#endif
props: { type: "AuditLog" },
},
//#endif
@@ -70,7 +78,7 @@ function titledAdminPage<
| typeof CAdminEditorPage
//#if AuditLogs
| typeof CAdminAuditLogPage,
- //#endif
+ //#endif
>(component: T) {
return defineComponent({
setup() {
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/site.scss b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/site.scss
index bcfa2ef58..3044096c9 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/site.scss
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/site.scss
@@ -23,3 +23,17 @@ a {
// Without setting this, icon appearance can vary with CSS load order
--fa-display: inline-flex;
}
+
+// Visually distinguish readonly inputs
+.v-input--readonly {
+ .v-switch__track,
+ .v-switch__thumb {
+ border: 1px dashed rgba(var(--v-theme-on-surface), 0.7);
+ }
+ .v-field__outline__start,
+ .v-field__outline__end,
+ .v-field__outline__notch::before,
+ .v-field__outline__notch::after {
+ border-style: dashed;
+ }
+}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/user-service.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/user-service.ts
index 0488cd9ef..5463a6312 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/user-service.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/user-service.ts
@@ -8,6 +8,7 @@ import {
const securityService = new SecurityServiceViewModel();
securityService.whoAmI.setConcurrency("debounce");
+
//#if AppInsights
securityService.whoAmI.onFulfilled(() => {
//@ts-expect-error AppInsights imported from backend JavaScriptSnippet; no types available.
@@ -15,6 +16,22 @@ securityService.whoAmI.onFulfilled(() => {
});
//#endif
+//#if Tenancy
+let initialTenantId: string | null = null;
+securityService.whoAmI.onFulfilled(() => {
+ const tid = userInfo.value.tenantId;
+ if (initialTenantId && initialTenantId != tid) {
+ console.warn("Tenant has changed. Forcing page reload.");
+ window.location.reload();
+ return new Promise(() => {
+ /* Never resolving promise so the new tenant info doesn't have a chance to mix in the UI with the old tenant info. */
+ });
+ } else {
+ initialTenantId = tid;
+ }
+});
+//#endif
+
/** Properties about the currently authenticated user */
export const userInfo = computed(() => {
return securityService.whoAmI.result ?? new UserInfo();
@@ -50,8 +67,6 @@ document.addEventListener(
false,
);
-refreshUserInfo();
-
// Make useful properties available in vue s
declare module "vue" {
interface ComponentCustomProperties {
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/viewmodels.g.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/viewmodels.g.ts
index cb380dcc1..296f176eb 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/viewmodels.g.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/viewmodels.g.ts
@@ -20,6 +20,7 @@ export interface AuditLogViewModel extends $models.AuditLog {
endpoint: string | null;
}
export class AuditLogViewModel extends ViewModel<$models.AuditLog, $apiClients.AuditLogApiClient, number> implements $models.AuditLog {
+ static DataSources = $models.AuditLog.DataSources;
public addToProperties(initialData?: DeepPartial<$models.AuditLogProperty> | null) {
@@ -33,6 +34,7 @@ export class AuditLogViewModel extends ViewModel<$models.AuditLog, $apiClients.A
defineProps(AuditLogViewModel, $metadata.AuditLog)
export class AuditLogListViewModel extends ListViewModel<$models.AuditLog, $apiClients.AuditLogApiClient, AuditLogViewModel> {
+ static DataSources = $models.AuditLog.DataSources;
constructor() {
super($metadata.AuditLog, new $apiClients.AuditLogApiClient())
@@ -86,25 +88,58 @@ export class RoleListViewModel extends ListViewModel<$models.Role, $apiClients.R
}
+export interface TenantViewModel extends $models.Tenant {
+ tenantId: string | null;
+ name: string | null;
+
+ /** The external origin of this tenant. Other users who sign in with accounts from this external source will automatically join this organization. */
+ externalId: string | null;
+}
+export class TenantViewModel extends ViewModel<$models.Tenant, $apiClients.TenantApiClient, string> implements $models.Tenant {
+ static DataSources = $models.Tenant.DataSources;
+
+ constructor(initialData?: DeepPartial<$models.Tenant> | null) {
+ super($metadata.Tenant, new $apiClients.TenantApiClient(), initialData)
+ }
+}
+defineProps(TenantViewModel, $metadata.Tenant)
+
+export class TenantListViewModel extends ListViewModel<$models.Tenant, $apiClients.TenantApiClient, TenantViewModel> {
+ static DataSources = $models.Tenant.DataSources;
+
+ public get create() {
+ const create = this.$apiClient.$makeCaller(
+ this.$metadata.methods.create,
+ (c, name: string | null, adminEmail: string | null) => c.create(name, adminEmail),
+ () => ({name: null as string | null, adminEmail: null as string | null, }),
+ (c, args) => c.create(args.name, args.adminEmail))
+
+ Object.defineProperty(this, 'create', {value: create});
+ return create
+ }
+
+ constructor() {
+ super($metadata.Tenant, new $apiClients.TenantApiClient())
+ }
+}
+
+
export interface UserViewModel extends $models.User {
fullName: string | null;
- photoMD5: string | null;
userName: string | null;
email: string | null;
-
- /** If set, the user will be blocked from signing in until this date. */
- lockoutEnd: Date | null;
-
- /** If enabled, the user can be locked out. */
- lockoutEnabled: boolean | null;
+ emailConfirmed: boolean | null;
+ photoHash: string | null;
get userRoles(): ViewModelCollection;
set userRoles(value: (UserRoleViewModel | $models.UserRole)[] | null);
+ roleNames: string[] | null;
- /** A summary of the effective permissions of the user, derived from their current roles. */
- effectivePermissions: string | null;
+ /** Global admins can perform some administrative actions against ALL tenants. */
+ isGlobalAdmin: boolean | null;
id: string | null;
}
export class UserViewModel extends ViewModel<$models.User, $apiClients.UserApiClient, string> implements $models.User {
+ static DataSources = $models.User.DataSources;
public addToUserRoles(initialData?: DeepPartial<$models.UserRole> | null) {
@@ -118,14 +153,25 @@ export class UserViewModel extends ViewModel<$models.User, $apiClients.UserApiCl
public get getPhoto() {
const getPhoto = this.$apiClient.$makeCaller(
this.$metadata.methods.getPhoto,
- (c) => c.getPhoto(this.$primaryKey, this.photoMD5),
+ (c) => c.getPhoto(this.$primaryKey, this.photoHash),
() => ({}),
- (c, args) => c.getPhoto(this.$primaryKey, this.photoMD5))
+ (c, args) => c.getPhoto(this.$primaryKey, this.photoHash))
Object.defineProperty(this, 'getPhoto', {value: getPhoto});
return getPhoto
}
+ public get evict() {
+ const evict = this.$apiClient.$makeCaller(
+ this.$metadata.methods.evict,
+ (c) => c.evict(this.$primaryKey),
+ () => ({}),
+ (c, args) => c.evict(this.$primaryKey))
+
+ Object.defineProperty(this, 'evict', {value: evict});
+ return evict
+ }
+
constructor(initialData?: DeepPartial<$models.User> | null) {
super($metadata.User, new $apiClients.UserApiClient(), initialData)
}
@@ -133,6 +179,18 @@ export class UserViewModel extends ViewModel<$models.User, $apiClients.UserApiCl
defineProps(UserViewModel, $metadata.User)
export class UserListViewModel extends ListViewModel<$models.User, $apiClients.UserApiClient, UserViewModel> {
+ static DataSources = $models.User.DataSources;
+
+ public get inviteUser() {
+ const inviteUser = this.$apiClient.$makeCaller(
+ this.$metadata.methods.inviteUser,
+ (c, email: string | null, role?: $models.Role | null) => c.inviteUser(email, role),
+ () => ({email: null as string | null, role: null as $models.Role | null, }),
+ (c, args) => c.inviteUser(args.email, args.role))
+
+ Object.defineProperty(this, 'inviteUser', {value: inviteUser});
+ return inviteUser
+ }
constructor() {
super($metadata.User, new $apiClients.UserApiClient())
@@ -220,6 +278,7 @@ const viewModelTypeLookup = ViewModel.typeLookup = {
AuditLog: AuditLogViewModel,
AuditLogProperty: AuditLogPropertyViewModel,
Role: RoleViewModel,
+ Tenant: TenantViewModel,
User: UserViewModel,
UserRole: UserRoleViewModel,
Widget: WidgetViewModel,
@@ -228,6 +287,7 @@ const listViewModelTypeLookup = ListViewModel.typeLookup = {
AuditLog: AuditLogListViewModel,
AuditLogProperty: AuditLogPropertyListViewModel,
Role: RoleListViewModel,
+ Tenant: TenantListViewModel,
User: UserListViewModel,
UserRole: UserRoleListViewModel,
Widget: WidgetListViewModel,
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/Admin.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/Admin.vue
index 59ea90517..7fcd11b33 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/Admin.vue
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/Admin.vue
@@ -1,79 +1,95 @@
-
-
- Coalesce Admin Tables
-
-
-
-
-
-
- {{
- type.displayName
- .split(" ")
- .map((w) => w[0])
- .join("")
- .slice(0, 4)
- }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ type.displayName
+ .split(" ")
+ .map((w) => w[0])
+ .join("")
+ .slice(0, 4)
+ }}
+
+
+
+
+
+
+
+
-
- Other Pages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -84,11 +100,14 @@ import { Domain, ModelType } from "coalesce-vue";
const excludedTypes: Array = [
//#if AuditLogs
"AuditLog",
- // "AuditLogProperty",
+ "AuditLogProperty",
//#endif
//#if Identity
"UserRole",
//#endif
+ //#if Tenancy
+ "Tenant",
+ //#endif
];
const adminTypes = Object.values(($metadata as Domain).types).filter(
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/UserProfile.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/UserProfile.vue
new file mode 100644
index 000000000..da16c19e3
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/UserProfile.vue
@@ -0,0 +1,160 @@
+
+
+
+ User Profile
+
+
+
+
+
+
+
+ fa fa-check-circle
+
+
+ fa fa-exclamation-triangle
+
+
+
+
+
+
+ Roles & permissions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Remove User from Tenant
+
+
+
+ Save
+
+
+
+
+
+
+
+
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/WidgetEdit.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/WidgetEdit.vue
index 4d230e6dd..4ba73a5f5 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/WidgetEdit.vue
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/WidgetEdit.vue
@@ -1,5 +1,5 @@
-
+
Coalesce Example
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/errors/Forbidden.vue b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/errors/Forbidden.vue
index 5751208b1..a4fe1da30 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/errors/Forbidden.vue
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/views/errors/Forbidden.vue
@@ -50,7 +50,7 @@ const props = defineProps<{ permissions?: Permission[] }>();
const logOutUrl = computed(
() =>
- "/Home/SignOut?ReturnUrl=" +
+ "/sign-out?ReturnUrl=" +
encodeURIComponent(
window.location.href.replace(window.location.origin, ""),
),
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.sln b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.sln
index a366c0d90..c9d8844e4 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.sln
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.sln
@@ -1,3 +1,4 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
diff --git a/templates/Coalesce.Vue.Template/content/Directory.Build.props b/templates/Coalesce.Vue.Template/content/Directory.Build.props
index 419e91a74..8aa35af84 100644
--- a/templates/Coalesce.Vue.Template/content/Directory.Build.props
+++ b/templates/Coalesce.Vue.Template/content/Directory.Build.props
@@ -5,13 +5,12 @@
enable
true
- true
- 5.5
- 5.0.0
+ 5.0.1
- KeepTemplateOnly;AppInsights;OpenAPI;Identity;MicrosoftAuth;GoogleAuth;AuditLogs;UserPictures;TrackingBase;ExampleModel
+ $(DefineConstants);KeepTemplateOnly;AppInsights;OpenAPI;Identity;MicrosoftAuth;GoogleAuth;AuditLogs;UserPictures;TrackingBase;ExampleModel
+ $(DefineConstants);Tenancy;TenantPerHostname;TenantCreateSelf;TenantCreateExternal;TenantCreateAdmin;TenantMemberInvites
- @* 
*@
- Sign In
-
+ ViewData["Title"] = "Sign In";
+}
-
+@*#if TenantMemberInvites *@
+@if (Model.ReturnUrl?.StartsWith("/invitation") == true)
+{
+ *@
- Sign In
-
+ You have been invited to join an organization!
+
+ Sign in or create an account to continue.
-
-
-
+}
+@*#endif *@
+
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignIn.cshtml.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignIn.cshtml.cs
index e55575e8d..dc235c5b8 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignIn.cshtml.cs
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignIn.cshtml.cs
@@ -10,17 +10,25 @@ public class SignInModel : PageModel
[BindProperty(SupportsGet = true)]
public string? ReturnUrl { get; set; }
+ [BindProperty]
+ public string? Provider { get; set; }
+
public void OnGet()
{
}
- public IActionResult OnPost([FromForm] string provider)
+ public IActionResult OnPost()
{
- // Request a redirect to the external login provider.
- return new ChallengeResult(provider, new()
+ if (!string.IsNullOrWhiteSpace(Provider))
{
- RedirectUri = ReturnUrl
- });
+ // Request a redirect to the external login provider.
+ return new ChallengeResult(Provider, new()
+ {
+ RedirectUri = ReturnUrl
+ });
+ }
+
+ return Page();
}
}
}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml
new file mode 100644
index 000000000..6cfacbebd
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml
@@ -0,0 +1,7 @@
+@page "/sign-out"
+@using Microsoft.AspNetCore.Authentication
+@model Coalesce.Starter.Vue.Web.Pages.SignOutModel
+
+@{
+ ViewData["Title"] = "Sign Out";
+}
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml.cs
new file mode 100644
index 000000000..09df66e17
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/SignOut.cshtml.cs
@@ -0,0 +1,22 @@
+using Coalesce.Starter.Vue.Data.Models;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Coalesce.Starter.Vue.Web.Pages
+{
+ public class SignOutModel(SignInManager+ Sign in or create an account to continue.
+
+
+
+ @RenderSection("Scripts", required: false)
+
+
\ No newline at end of file
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewImports.cshtml b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewImports.cshtml
new file mode 100644
index 000000000..9397f9d75
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using Coalesce.Starter.Vue.Data.Auth
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewStart.cshtml b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewStart.cshtml
new file mode 100644
index 000000000..596003a68
--- /dev/null
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+ Layout = "_Layout.cshtml";
+}
\ No newline at end of file
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
index c29df0a28..d0528e8bf 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs
@@ -18,23 +18,27 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
+using Coalesce.Starter.Vue.Web.Auth;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc;
var builder = WebApplication.CreateBuilder(new WebApplicationOptions
{
- Args = args,
- // Explicit declaration prevents ASP.NET Core from erroring if wwwroot doesn't exist at startup:
- WebRootPath = "wwwroot"
+ Args = args,
+ // Explicit declaration prevents ASP.NET Core from erroring if wwwroot doesn't exist at startup:
+ WebRootPath = "wwwroot"
});
builder.Logging
- .AddConsole()
- // Filter out Request Starting/Request Finished noise:
- .AddFilter
+
+ @*
+
+ @RenderBody()
+
+
+ @* 
*@
+
+ @ViewData["Title"]
+
+
+ @RenderBody()
+ + +
+ You have created a multi-tenant Coalesce application. The tenancy + model implemented in this template works as follows: +
++
+ Every entity that exists within a tenant implements
+ ITenanted.
+
+
+ Entity Framework model configuration is customized to place the
+ TenantId as the first part of a composite primary key
+ on ITenanted entities. Foreign keys between tenanted
+ entities are updated to include the TenantId, which
+ makes it 100% impossible for one tenant's data to become
+ accidentally linked to another tenant's data.
+
+
+ Entity Framework is configured with a global query filter to + automatically filter queries to the current tenant, and with + interceptors and value generators to automatically populate the + current TenantId on new entities. +
++
+ Users exist independently of tenants, with their membership to
+ zero-or-more tenants recorded in the
+ TenantMembership table.
+
+
+ A user can have a special "GlobalAdmin" role, which could be + utilized in your custom code to allow administration of all + tenants. + + + Out of the box, the role allows for the creation of new tenants. + +
+Resources
+-
+
- + Check out + + 🎉 awesome-vue + + for Vue components, libraries, examples, and more! + +
+
Resources
--
-
- - Check out - - 🎉 awesome-vue - - for Vue components, libraries, examples, and more! - -
-
Effective Permissions:
+
+
+
+
+
+