@baseplate-dev/plugin-auth 0.6.18 → 0.6.20

package/dist/local-auth/core/generators/auth-email-password/templates/module/services/invite.service.js

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { AUTH_TOKEN_MAX_LENGTH, INVITE_TOKEN_EXPIRY_SEC, PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH, } from '$constantsPassword';
+import { getWebUrl } from '%appUrlsImports';
 import { createAuthVerification, validateAuthVerification, } from '%authModuleImports';
-import { getConfig } from '%configServiceImports';
 import { BadRequestError, handleZodRequestValidationError, NotFoundError, } from '%errorHandlerServiceImports';
 import { createPasswordHash } from '%passwordHasherServiceImports';
 import { prisma } from '%prismaImports';
@@ -38,7 +38,7 @@ export async function inviteUser({ userId, context, }) {
         userId: user.id,
         expiresInSec: INVITE_TOKEN_EXPIRY_SEC,
     });
-    const acceptLink = `${getConfig().AUTH_FRONTEND_URL}/auth/accept-invite?token=${encodeURIComponent(token)}`;
+    const acceptLink = getWebUrl(TPL_AUTH_WEB_APP, `/auth/accept-invite?token=${encodeURIComponent(token)}`);
     await services.email.send(TPL_INVITE_EMAIL, {
         to: user.email,
         data: { acceptLink },
@@ -105,27 +105,31 @@ export async function acceptInvite({ token: rawToken, newPassword: rawNewPasswor
     if (!user.email) {
         throw new BadRequestError('User has no email', 'user-has-no-email');
     }
+    // The invite token outlives the check in `inviteUser`, so the user may have
+    // registered in the meantime.
+    const existingAccount = await prisma.userAccount.findUnique({
+        where: {
+            accountId_providerId: {
+                accountId: user.email,
+                providerId: PROVIDER_ID,
+            },
+        },
+    });
+    if (existingAccount) {
+        throw new BadRequestError('User already has a password set', 'user-already-has-account');
+    }
     const passwordHash = await createPasswordHash(newPassword);
     await prisma.$transaction([
         prisma.authVerification.deleteMany({
             where: { type: INVITE_TYPE, userId: user.id },
         }),
-        prisma.userAccount.upsert({
-            where: {
-                accountId_providerId: {
-                    accountId: user.email,
-                    providerId: PROVIDER_ID,
-                },
-            },
-            create: {
+        prisma.userAccount.create({
+            data: {
                 userId: user.id,
                 accountId: user.email,
                 providerId: PROVIDER_ID,
                 password: passwordHash,
             },
-            update: {
-                password: passwordHash,
-            },
         }),
         prisma.user.update({
             where: { id: user.id },

package/dist/local-auth/core/generators/auth-email-password/templates/module/services/invite.service.ts

@@ -13,11 +13,11 @@ import {
   PASSWORD_MAX_LENGTH,
   PASSWORD_MIN_LENGTH,
 } from '$constantsPassword';
+import { getWebUrl } from '%appUrlsImports';
 import {
   createAuthVerification,
   validateAuthVerification,
 } from '%authModuleImports';
-import { getConfig } from '%configServiceImports';
 import {
   BadRequestError,
   handleZodRequestValidationError,
@@ -76,7 +76,10 @@ export async function inviteUser({
     expiresInSec: INVITE_TOKEN_EXPIRY_SEC,
   });
 
-  const acceptLink = `${getConfig().AUTH_FRONTEND_URL}/auth/accept-invite?token=${encodeURIComponent(token)}`;
+  const acceptLink = getWebUrl(
+    TPL_AUTH_WEB_APP,
+    `/auth/accept-invite?token=${encodeURIComponent(token)}`,
+  );
 
   await services.email.send(TPL_INVITE_EMAIL, {
     to: user.email,
@@ -171,28 +174,37 @@ export async function acceptInvite({
     throw new BadRequestError('User has no email', 'user-has-no-email');
   }
 
+  // The invite token outlives the check in `inviteUser`, so the user may have
+  // registered in the meantime.
+  const existingAccount = await prisma.userAccount.findUnique({
+    where: {
+      accountId_providerId: {
+        accountId: user.email,
+        providerId: PROVIDER_ID,
+      },
+    },
+  });
+
+  if (existingAccount) {
+    throw new BadRequestError(
+      'User already has a password set',
+      'user-already-has-account',
+    );
+  }
+
   const passwordHash = await createPasswordHash(newPassword);
 
   await prisma.$transaction([
     prisma.authVerification.deleteMany({
       where: { type: INVITE_TYPE, userId: user.id },
     }),
-    prisma.userAccount.upsert({
-      where: {
-        accountId_providerId: {
-          accountId: user.email,
-          providerId: PROVIDER_ID,
-        },
-      },
-      create: {
+    prisma.userAccount.create({
+      data: {
         userId: user.id,
         accountId: user.email,
         providerId: PROVIDER_ID,
         password: passwordHash,
       },
-      update: {
-        password: passwordHash,
-      },
     }),
     prisma.user.update({
       where: { id: user.id },

package/dist/local-auth/core/generators/auth-email-password/templates/module/services/password-reset.service.js

@@ -1,8 +1,8 @@
 // @ts-nocheck
 import { AUTH_TOKEN_MAX_LENGTH, PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH, PASSWORD_RESET_TOKEN_EXPIRY_SEC, } from '$constantsPassword';
 import { resetLoginRateLimits } from '$servicesUserPassword';
+import { getWebAppForUrl, getWebUrl } from '%appUrlsImports';
 import { createAuthVerification, validateAuthVerification, } from '%authModuleImports';
-import { getConfig } from '%configServiceImports';
 import { BadRequestError, handleZodRequestValidationError, } from '%errorHandlerServiceImports';
 import { createPasswordHash } from '%passwordHasherServiceImports';
 import { prisma } from '%prismaImports';
@@ -58,8 +58,7 @@ export async function requestPasswordReset({ email: rawEmail, context, }) {
             userId: user.id,
             expiresInSec: PASSWORD_RESET_TOKEN_EXPIRY_SEC,
         });
-        // Construct reset URL using configured domain
-        const resetLink = `${getConfig().AUTH_FRONTEND_URL}/auth/reset-password?token=${encodeURIComponent(token)}`;
+        const resetLink = getWebUrl(getWebAppForUrl(context.reqInfo.headers.origin) ?? TPL_AUTH_WEB_APP, `/auth/reset-password?token=${encodeURIComponent(token)}`);
         // Send email asynchronously (queue-based)
         await services.email.send(TPL_PASSWORD_RESET_EMAIL, {
             to: user.email,

package/dist/local-auth/core/generators/auth-email-password/templates/module/services/password-reset.service.ts

@@ -9,11 +9,11 @@ import {
   PASSWORD_RESET_TOKEN_EXPIRY_SEC,
 } from '$constantsPassword';
 import { resetLoginRateLimits } from '$servicesUserPassword';
+import { getWebAppForUrl, getWebUrl } from '%appUrlsImports';
 import {
   createAuthVerification,
   validateAuthVerification,
 } from '%authModuleImports';
-import { getConfig } from '%configServiceImports';
 import {
   BadRequestError,
   handleZodRequestValidationError,
@@ -108,8 +108,10 @@ export async function requestPasswordReset({
       expiresInSec: PASSWORD_RESET_TOKEN_EXPIRY_SEC,
     });
 
-    // Construct reset URL using configured domain
-    const resetLink = `${getConfig().AUTH_FRONTEND_URL}/auth/reset-password?token=${encodeURIComponent(token)}`;
+    const resetLink = getWebUrl(
+      getWebAppForUrl(context.reqInfo.headers.origin) ?? TPL_AUTH_WEB_APP,
+      `/auth/reset-password?token=${encodeURIComponent(token)}`,
+    );
 
     // Send email asynchronously (queue-based)
     await services.email.send(TPL_PASSWORD_RESET_EMAIL, {

package/dist/local-auth/core/generators/auth-hooks/auth-hooks.generator.d.ts

@@ -15,8 +15,8 @@ export declare const authHooksGenerator: import("@baseplate-dev/sync").Generator
                 isTypeOnly: true;
             };
             useLogOut: {};
-            useRequiredUserId: {};
             useSession: {};
+            useUserIdOrThrow: {};
             AuthRole: {
                 isTypeOnly: true;
             };
@@ -39,6 +39,278 @@ export declare const authHooksGenerator: import("@baseplate-dev/sync").Generator
             };
         }>>;
         paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").LocalAuthCoreAuthHooksPaths>;
+        reactComponentsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            AddOptionRequiredFields: {
+                isTypeOnly: true;
+            };
+            Alert: {};
+            AlertAction: {};
+            AlertDescription: {};
+            AlertTitle: {};
+            Autocomplete: {};
+            AutocompleteClear: {};
+            AutocompleteCollection: {};
+            AutocompleteContent: {};
+            AutocompleteEmpty: {};
+            AutocompleteGroup: {};
+            AutocompleteInput: {};
+            AutocompleteItem: {};
+            AutocompleteLabel: {};
+            AutocompleteList: {};
+            AutocompleteSeparator: {};
+            AutocompleteStatus: {};
+            AutocompleteTrigger: {};
+            AutocompleteValue: {};
+            Badge: {};
+            badgeVariants: {};
+            Breadcrumb: {};
+            BreadcrumbEllipsis: {};
+            BreadcrumbItem: {};
+            BreadcrumbLink: {};
+            BreadcrumbList: {};
+            BreadcrumbPage: {};
+            BreadcrumbSeparator: {};
+            Button: {};
+            buttonVariants: {};
+            Calendar: {};
+            Card: {};
+            CardAction: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
+            Checkbox: {};
+            CheckboxField: {};
+            CheckboxFieldController: {};
+            CircularProgress: {};
+            cn: {};
+            Collapsible: {};
+            CollapsibleContent: {};
+            CollapsibleTrigger: {};
+            Combobox: {};
+            ComboboxField: {};
+            ComboboxFieldController: {};
+            ConfirmDialog: {};
+            DatePickerField: {};
+            DatePickerFieldController: {};
+            DateTimePickerField: {};
+            DateTimePickerFieldController: {};
+            Dialog: {};
+            DialogClose: {};
+            DialogContent: {};
+            DialogDescription: {};
+            DialogFooter: {};
+            DialogHeader: {};
+            DialogOverlay: {};
+            DialogPortal: {};
+            DialogTitle: {};
+            DialogTrigger: {};
+            DialogWidth: {
+                isTypeOnly: true;
+            };
+            DropdownMenu: {};
+            DropdownMenuCheckboxItem: {};
+            DropdownMenuContent: {};
+            DropdownMenuGroup: {};
+            DropdownMenuItem: {};
+            DropdownMenuLabel: {};
+            DropdownMenuPortal: {};
+            DropdownMenuRadioGroup: {};
+            DropdownMenuRadioItem: {};
+            DropdownMenuSeparator: {};
+            DropdownMenuShortcut: {};
+            DropdownMenuSub: {};
+            DropdownMenuSubContent: {};
+            DropdownMenuSubTrigger: {};
+            DropdownMenuTrigger: {};
+            Empty: {};
+            EmptyContent: {};
+            EmptyDescription: {};
+            EmptyHeader: {};
+            EmptyMedia: {};
+            emptyMediaVariants: {};
+            EmptyTitle: {};
+            ErrorableLoader: {};
+            ErrorDisplay: {};
+            Field: {};
+            FieldContent: {};
+            FieldDescription: {};
+            FieldError: {};
+            FieldGroup: {};
+            FieldLabel: {};
+            FieldLegend: {};
+            FieldSeparator: {};
+            FieldSet: {};
+            FieldTitle: {};
+            fieldVariants: {};
+            FormFieldProps: {
+                isTypeOnly: true;
+            };
+            IconElement: {
+                isTypeOnly: true;
+            };
+            Input: {};
+            InputField: {};
+            InputFieldController: {};
+            InputGroup: {};
+            InputGroupAddon: {};
+            InputGroupButton: {};
+            InputGroupInput: {};
+            InputGroupText: {};
+            InputGroupTextarea: {};
+            InputOtp: {};
+            InputOtpField: {};
+            InputOtpFieldController: {};
+            InputOtpGroup: {};
+            InputOtpSeparator: {};
+            InputOtpSlot: {};
+            inputVariants: {};
+            Item: {};
+            ItemActions: {};
+            ItemContent: {};
+            ItemDescription: {};
+            ItemFooter: {};
+            ItemGroup: {};
+            ItemHeader: {};
+            ItemMedia: {};
+            itemMediaVariants: {};
+            ItemSeparator: {};
+            ItemTitle: {};
+            itemVariants: {};
+            Label: {};
+            Loader: {};
+            mergeRefs: {};
+            MultiComboboxField: {};
+            MultiComboboxFieldController: {};
+            MultiComboboxFieldProps: {
+                isTypeOnly: true;
+            };
+            MultiSelectOptionProps: {
+                isTypeOnly: true;
+            };
+            NavigationMenu: {};
+            NavigationMenuContent: {};
+            NavigationMenuIndicator: {};
+            NavigationMenuItem: {};
+            NavigationMenuItemWithLink: {};
+            NavigationMenuLink: {};
+            NavigationMenuList: {};
+            NavigationMenuTrigger: {};
+            navigationMenuTriggerStyle: {};
+            NotFoundCard: {};
+            NumberField: {};
+            NumberFieldController: {};
+            PageHeader: {};
+            PageHeaderActions: {};
+            PageHeaderDescription: {};
+            PageHeaderTitle: {};
+            Popover: {};
+            PopoverContent: {};
+            PopoverTrigger: {};
+            RadioField: {};
+            RadioFieldController: {};
+            RadioOptionProps: {
+                isTypeOnly: true;
+            };
+            ScrollArea: {};
+            Section: {};
+            SectionActions: {};
+            SectionDescription: {};
+            SectionHeader: {};
+            SectionTitle: {};
+            Select: {};
+            SelectField: {};
+            SelectFieldController: {};
+            SelectOptionProps: {
+                isTypeOnly: true;
+            };
+            Separator: {};
+            Sheet: {};
+            SheetClose: {};
+            SheetContent: {};
+            SheetDescription: {};
+            SheetFooter: {};
+            SheetHeader: {};
+            SheetTitle: {};
+            SheetTrigger: {};
+            Sidebar: {};
+            SidebarContent: {};
+            SidebarFooter: {};
+            SidebarGroup: {};
+            SidebarGroupAction: {};
+            SidebarGroupContent: {};
+            SidebarGroupLabel: {};
+            SidebarHeader: {};
+            SidebarInput: {};
+            SidebarInset: {};
+            SidebarMenu: {};
+            SidebarMenuAction: {};
+            SidebarMenuBadge: {};
+            SidebarMenuButton: {};
+            SidebarMenuItem: {};
+            SidebarMenuSkeleton: {};
+            SidebarMenuSub: {};
+            SidebarMenuSubButton: {};
+            SidebarMenuSubItem: {};
+            SidebarProvider: {};
+            SidebarRail: {};
+            SidebarSeparator: {};
+            SidebarTrigger: {};
+            Skeleton: {};
+            Slider: {};
+            Spinner: {};
+            Switch: {};
+            SwitchField: {};
+            SwitchFieldController: {};
+            Table: {};
+            TableBody: {};
+            TableCaption: {};
+            TableCell: {};
+            TableFooter: {};
+            TableHead: {};
+            TableHeader: {};
+            TableRow: {};
+            Textarea: {};
+            TextareaField: {};
+            TextareaFieldController: {};
+            Toast: {};
+            toast: {};
+            ToastAction: {};
+            ToastClose: {};
+            ToastContent: {};
+            ToastDescription: {};
+            Toaster: {};
+            toastManager: {};
+            ToastOptions: {
+                isTypeOnly: true;
+            };
+            ToastPortal: {};
+            ToastProvider: {};
+            ToastTitle: {};
+            ToastType: {
+                isTypeOnly: true;
+            };
+            ToastUpdateOptions: {
+                isTypeOnly: true;
+            };
+            ToastViewport: {};
+            Tooltip: {};
+            TooltipContent: {};
+            TooltipProvider: {};
+            TooltipTrigger: {};
+            useAutocompleteFilter: {};
+            useConfirmDialog: {};
+            UseConfirmDialogRequestOptions: {
+                isTypeOnly: true;
+            };
+            useConfirmDialogState: {};
+            useControlledState: {};
+            useControllerMerged: {};
+            useFieldIds: {};
+            useIsMobile: {};
+            useSidebar: {};
+        }>>;
         reactErrorImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             formatError: {};
             logAndFormatError: {};