Add logic to prevent inviting users if account lacks a name

Author: tjementum

application/account-management/Core/Features/Users/Commands/InviteUser.cs

@@ -1,5 +1,6 @@
 using FluentValidation;
 using JetBrains.Annotations;
+using PlatformPlatform.AccountManagement.Features.Tenants.Domain;
 using PlatformPlatform.AccountManagement.Features.Users.Domain;
 using PlatformPlatform.SharedKernel.Cqrs;
 using PlatformPlatform.SharedKernel.ExecutionContext;
@@ -26,6 +27,7 @@ public InviteUserValidator()
 
 public sealed class InviteUserHandler(
     IUserRepository userRepository,
+    ITenantRepository tenantRepository,
     IEmailClient emailClient,
     IExecutionContext executionContext,
     IMediator mediator,
@@ -39,6 +41,12 @@ public async Task<Result> Handle(InviteUserCommand command, CancellationToken ca
             return Result.Forbidden("Only owners are allowed to invite other users.");
         }
 
+        var tenant = await tenantRepository.GetCurrentTenantAsync(cancellationToken);
+        if (string.IsNullOrWhiteSpace(tenant.Name))
+        {
+            return Result.BadRequest("Account name must be set before inviting users.");
+        }
+
         if (!await userRepository.IsEmailFreeAsync(command.Email, cancellationToken))
         {
             return Result.BadRequest($"The user with '{command.Email}' already exists.");
@@ -53,7 +61,7 @@ public async Task<Result> Handle(InviteUserCommand command, CancellationToken ca
         var loginPath = $"{Environment.GetEnvironmentVariable(SinglePageAppConfiguration.PublicUrlKey)}/login";
         var inviter = $"{executionContext.UserInfo.FirstName} {executionContext.UserInfo.LastName}".Trim();
         inviter = inviter.Length > 0 ? inviter : executionContext.UserInfo.Email;
-        await emailClient.SendAsync(command.Email.ToLower(), $"You have been invited to join {executionContext.TenantId} on PlatformPlatform",
+        await emailClient.SendAsync(command.Email.ToLower(), $"You have been invited to join {tenant.Name} on PlatformPlatform",
             $"""
              <h1 style="text-align:center;font-family:sans-serif;font-size:20px">
                <b>{inviter}</b> invited you to join PlatformPlatform.

application/account-management/Tests/Authentication/CompleteLoginTests.cs

@@ -192,6 +192,11 @@ public async Task CompleteLogin_WhenLoginExpired_ShouldReturnBadRequest()
     public async Task CompleteLogin_WhenUserInviteCompleted_ShouldTrackUserInviteAcceptedEvent()
     {
         // Arrange
+        // Set tenant name first (required for inviting users)
+        Connection.Update("Tenants", "Id", DatabaseSeeder.Tenant1.Id.ToString(),
+            [("Name", "Test Company")]
+        );
+
         var email = Faker.Internet.Email();
         var inviteUserCommand = new InviteUserCommand(email);
         await AuthenticatedOwnerHttpClient.PostAsJsonAsync("/api/account-management/users/invite", inviteUserCommand);

application/account-management/Tests/Users/InviteUserTests.cs

@@ -14,10 +14,31 @@ namespace PlatformPlatform.AccountManagement.Tests.Users;
 public sealed class InviteUserTests : EndpointBaseTest<AccountManagementDbContext>
 {
     [Fact]
-    public async Task InviteUser_WhenValid_ShouldCreateUserWithEmailConfirmedFalse()
+    public async Task InviteUser_WhenTenantNameNotSet_ShouldReturnBadRequest()
     {
         // Arrange
-        var tenantId = DatabaseSeeder.Tenant1.Id.ToString();
+        var email = Faker.Internet.Email();
+        var command = new InviteUserCommand(email);
+
+        // Act
+        var response = await AuthenticatedOwnerHttpClient.PostAsJsonAsync("/api/account-management/users/invite", command);
+
+        // Assert
+        await response.ShouldHaveErrorStatusCode(HttpStatusCode.BadRequest, "Account name must be set before inviting users.");
+
+        TelemetryEventsCollectorSpy.AreAllEventsDispatched.Should().BeFalse();
+    }
+
+    [Fact]
+    public async Task InviteUser_WhenTenantHasName_ShouldCreateUserAndUseTenantNameInEmail()
+    {
+        // Arrange
+        var tenantName = "Test Company";
+        // Update tenant name using SqliteConnectionExtensions
+        Connection.Update("Tenants", "Id", DatabaseSeeder.Tenant1.Id.ToString(),
+            [("Name", tenantName)]
+        );
+
         var email = Faker.Internet.Email();
         var command = new InviteUserCommand(email);
 
@@ -26,9 +47,11 @@ public async Task InviteUser_WhenValid_ShouldCreateUserWithEmailConfirmedFalse()
 
         // Assert
         await response.ShouldBeSuccessfulPostRequest(hasLocation: false);
+
+        // Verify user was created
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE TenantId = @tenantId AND Email = @email AND EmailConfirmed = 0",
-            new { tenantId, email = email.ToLower() }
+            new { tenantId = DatabaseSeeder.Tenant1.Id.ToString(), email = email.ToLower() }
         ).Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(2);
@@ -38,7 +61,7 @@ public async Task InviteUser_WhenValid_ShouldCreateUserWithEmailConfirmedFalse()
 
         await EmailClient.Received(1).SendAsync(
             email.ToLower(),
-            $"You have been invited to join {tenantId} on PlatformPlatform",
+            $"You have been invited to join {tenantName} on PlatformPlatform",
             Arg.Is<string>(s => s.Contains("To gain access")),
             Arg.Any<CancellationToken>()
         );
@@ -68,6 +91,11 @@ public async Task InviteUser_WhenInvalidEmail_ShouldReturnBadRequest()
     public async Task InviteUser_WhenUserExists_ShouldReturnBadRequest()
     {
         // Arrange
+        // Set tenant name first (required for inviting users)
+        Connection.Update("Tenants", "Id", DatabaseSeeder.Tenant1.Id.ToString(),
+            [("Name", "Test Company")]
+        );
+
         var existingUserEmail = DatabaseSeeder.Tenant1Owner.Email;
         var command = new InviteUserCommand(existingUserEmail);
 

application/account-management/WebApp/routes/admin/users/-components/TenantNameRequiredDialog.tsx

@@ -0,0 +1,53 @@
+import { t } from "@lingui/core/macro";
+import { Trans } from "@lingui/react/macro";
+import { Button } from "@repo/ui/components/Button";
+import { Dialog } from "@repo/ui/components/Dialog";
+import { DialogContent, DialogFooter, DialogHeader } from "@repo/ui/components/DialogFooter";
+import { Heading } from "@repo/ui/components/Heading";
+import { Modal } from "@repo/ui/components/Modal";
+import { Link } from "@tanstack/react-router";
+import { AlertCircleIcon, XIcon } from "lucide-react";
+
+interface TenantNameRequiredDialogProps {
+  isOpen: boolean;
+  onOpenChange: (isOpen: boolean) => void;
+}
+
+export function TenantNameRequiredDialog({ isOpen, onOpenChange }: Readonly<TenantNameRequiredDialogProps>) {
+  return (
+    <Modal isOpen={isOpen} onOpenChange={onOpenChange} isDismissable={true}>
+      <Dialog className="sm:max-w-lg">
+        {({ close }) => (
+          <>
+            <XIcon onClick={close} className="absolute top-2 right-2 h-10 w-10 cursor-pointer p-2 hover:bg-muted" />
+            <DialogHeader description={t`Help your team recognize your invites`}>
+              <Heading slot="title" className="text-2xl">
+                <Trans>Add your account name</Trans>
+              </Heading>
+            </DialogHeader>
+
+            <DialogContent className="flex flex-col gap-4">
+              <div className="flex items-center gap-3 rounded-lg border border-border bg-muted/50 p-4">
+                <AlertCircleIcon className="h-5 w-5 text-warning" />
+                <p className="text-sm">
+                  <Trans>Your team needs to know who's inviting them. Add an account name to get started.</Trans>
+                </p>
+              </div>
+            </DialogContent>
+
+            <DialogFooter>
+              <Button variant="secondary" onPress={close}>
+                <Trans>Cancel</Trans>
+              </Button>
+              <Link to="/admin/account">
+                <Button variant="primary" onPress={close}>
+                  <Trans>Go to account settings</Trans>
+                </Button>
+              </Link>
+            </DialogFooter>
+          </>
+        )}
+      </Dialog>
+    </Modal>
+  );
+}

application/account-management/WebApp/routes/admin/users/-components/UserToolbar.tsx

@@ -8,6 +8,7 @@ import { PlusIcon, Trash2Icon } from "lucide-react";
 import { useState } from "react";
 import { DeleteUserDialog } from "./DeleteUserDialog";
 import InviteUserDialog from "./InviteUserDialog";
+import { TenantNameRequiredDialog } from "./TenantNameRequiredDialog";
 import { UserQuerying } from "./UserQuerying";
 
 type UserDetails = components["schemas"]["UserDetails"];
@@ -19,28 +20,39 @@ interface UserToolbarProps {
 
 export function UserToolbar({ selectedUsers, onSelectedUsersChange }: Readonly<UserToolbarProps>) {
   const { data: currentUser } = api.useQuery("get", "/api/account-management/users/me");
+  const { data: tenant } = api.useQuery("get", "/api/account-management/tenants/current");
   const [isInviteModalOpen, setIsInviteModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const [showTenantNameRequiredDialog, setShowTenantNameRequiredDialog] = useState(false);
   const [_isFilterBarExpanded, setIsFilterBarExpanded] = useState(false);
   const [_hasActiveFilters, setHasActiveFilters] = useState(false);
   const [shouldUseCompactButtons, setShouldUseCompactButtons] = useState(false);
 
   const isOwner = currentUser?.role === UserRole.Owner;
   const hasSelectedSelf = selectedUsers.some((user) => user.id === currentUser?.id);
+  const hasTenantName = tenant?.name && tenant.name.trim() !== "";
 
   const handleFilterStateChange = (isExpanded: boolean, hasFilters: boolean, useCompact: boolean) => {
     setIsFilterBarExpanded(isExpanded);
     setHasActiveFilters(hasFilters);
     setShouldUseCompactButtons(useCompact);
   };
 
+  const handleInviteClick = () => {
+    if (!hasTenantName) {
+      setShowTenantNameRequiredDialog(true);
+      return;
+    }
+    setIsInviteModalOpen(true);
+  };
+
   return (
     <div className="-mt-5 mb-4 flex items-center justify-between gap-2 bg-background/95 pt-5 backdrop-blur-sm">
       <UserQuerying onFilterStateChange={handleFilterStateChange} onFiltersUpdated={() => onSelectedUsersChange([])} />
       <div className="mt-6 flex items-center gap-2">
         {selectedUsers.length < 2 && isOwner && (
           <TooltipTrigger>
-            <Button variant="primary" onPress={() => setIsInviteModalOpen(true)} aria-label={t`Invite user`}>
+            <Button variant="primary" onPress={handleInviteClick} aria-label={t`Invite user`}>
               <PlusIcon className="h-5 w-5" />
               <span className={shouldUseCompactButtons ? "hidden" : "hidden sm:inline"}>
                 <Trans>Invite user</Trans>
@@ -75,6 +87,7 @@ export function UserToolbar({ selectedUsers, onSelectedUsersChange }: Readonly<U
         )}
       </div>
       {isOwner && <InviteUserDialog isOpen={isInviteModalOpen} onOpenChange={setIsInviteModalOpen} />}
+      <TenantNameRequiredDialog isOpen={showTenantNameRequiredDialog} onOpenChange={setShowTenantNameRequiredDialog} />
       <DeleteUserDialog
         users={selectedUsers}
         isOpen={isDeleteModalOpen}

application/account-management/WebApp/shared/translations/locale/da-DK.po

@@ -50,6 +50,9 @@ msgstr "Tilføj flere i Brugere menuen"
 msgid "Add profile picture"
 msgstr "Tilføj profilbillede"
 
+msgid "Add your account name"
+msgstr "Tilføj dit kontonavn"
+
 msgid "Admin"
 msgstr "Admin"
 
@@ -219,6 +222,12 @@ msgstr "Filtre"
 msgid "First name"
 msgstr "Fornavn"
 
+msgid "Go to account settings"
+msgstr "Gå til kontoindstillinger"
+
+msgid "Help your team recognize your invites"
+msgstr "Hjælp dit team med at genkende dine invitationer"
+
 msgid "Here's your overview of what's happening."
 msgstr "Her er din oversigt over, hvad der sker."
 
@@ -503,6 +512,9 @@ msgstr "Velkommen hjem"
 msgid "Welcome home, {0}"
 msgstr "Velkommen hjem, {0}"
 
+msgid "Your team needs to know who's inviting them. Add an account name to get started."
+msgstr "Dit team skal vide, hvem der inviterer dem. Tilføj et kontonavn for at komme i gang."
+
 msgid "Your verification code has expired"
 msgstr "Din bekræftelseskode er udløbet"
 

application/account-management/WebApp/shared/translations/locale/en-US.po

@@ -50,6 +50,9 @@ msgstr "Add more in the Users menu"
 msgid "Add profile picture"
 msgstr "Add profile picture"
 
+msgid "Add your account name"
+msgstr "Add your account name"
+
 msgid "Admin"
 msgstr "Admin"
 
@@ -219,6 +222,12 @@ msgstr "Filters"
 msgid "First name"
 msgstr "First name"
 
+msgid "Go to account settings"
+msgstr "Go to account settings"
+
+msgid "Help your team recognize your invites"
+msgstr "Help your team recognize your invites"
+
 msgid "Here's your overview of what's happening."
 msgstr "Here's your overview of what's happening."
 
@@ -503,6 +512,9 @@ msgstr "Welcome home"
 msgid "Welcome home, {0}"
 msgstr "Welcome home, {0}"
 
+msgid "Your team needs to know who's inviting them. Add an account name to get started."
+msgstr "Your team needs to know who's inviting them. Add an account name to get started."
+
 msgid "Your verification code has expired"
 msgstr "Your verification code has expired"
 

application/account-management/WebApp/shared/translations/locale/nl-NL.po

@@ -50,6 +50,9 @@ msgstr "Nieuwe toevoegen via het Gebruikers menu"
 msgid "Add profile picture"
 msgstr "Profielfoto toevoegen"
 
+msgid "Add your account name"
+msgstr "Voeg je accountnaam toe"
+
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -219,6 +222,12 @@ msgstr "Filters"
 msgid "First name"
 msgstr "Voornaam"
 
+msgid "Go to account settings"
+msgstr "Ga naar accountinstellingen"
+
+msgid "Help your team recognize your invites"
+msgstr "Help je team je uitnodigingen te herkennen"
+
 msgid "Here's your overview of what's happening."
 msgstr "Hier is je overzicht van wat er gebeurt."
 
@@ -503,6 +512,9 @@ msgstr "Welkom home"
 msgid "Welcome home, {0}"
 msgstr "Welkom home, {0}"
 
+msgid "Your team needs to know who's inviting them. Add an account name to get started."
+msgstr "Je team moet weten wie hen uitnodigt. Voeg een accountnaam toe om te beginnen."
+
 msgid "Your verification code has expired"
 msgstr "Je verificatiecode is verlopen"