@baseplate-dev/plugin-auth 1.0.7 → 1.0.8

package/dist/local-auth/core/generators/auth-module/templates/module/services/user-session.service.ts

@@ -20,7 +20,7 @@ import {
 import { verifyRequestOrigin } from '$verifyRequestOrigin';
 import { InvalidSessionError } from '%authContextImports';
 import { DEFAULT_USER_ROLES } from '%authRolesImports';
-import { config } from '%configServiceImports';
+import { getConfig, isDevelopment } from '%configServiceImports';
 import { ForbiddenError } from '%errorHandlerServiceImports';
 import { prisma } from '%prismaImports';
 import { randomBytes } from 'node:crypto';
@@ -30,13 +30,15 @@ interface SessionCookieValue {
   token: string;
 }
 
-const COOKIE_OPTIONS: CookieSerializeOptions = {
-  httpOnly: true,
-  sameSite: 'lax',
-  secure: config.APP_ENVIRONMENT !== 'dev',
-  maxAge: USER_SESSION_DURATION_SEC,
-  path: '/',
-};
+function getCookieOptions(): CookieSerializeOptions {
+  return {
+    httpOnly: true,
+    sameSite: 'lax',
+    secure: !isDevelopment(),
+    maxAge: USER_SESSION_DURATION_SEC,
+    path: '/',
+  };
+}
 
 /**
  * Validates the expiry of a user session and determines if it needs to be renewed.
@@ -129,9 +131,9 @@ export class CookieUserSessionService implements UserSessionService {
     ];
 
     const cookieName = getUserSessionCookieName(context.reqInfo.headers);
-    const cookieValue = signObject({ token }, config.AUTH_SECRET);
+    const cookieValue = signObject({ token }, getConfig().AUTH_SECRET);
 
-    context.cookieStore.set(cookieName, cookieValue, COOKIE_OPTIONS);
+    context.cookieStore.set(cookieName, cookieValue, getCookieOptions());
 
     return { userId, expiresAt, roles };
   }
@@ -151,7 +153,7 @@ export class CookieUserSessionService implements UserSessionService {
     });
 
     const cookieName = getUserSessionCookieName(context.reqInfo.headers);
-    context.cookieStore.clear(cookieName, COOKIE_OPTIONS);
+    context.cookieStore.clear(cookieName, getCookieOptions());
   }
 
   /**
@@ -180,7 +182,7 @@ export class CookieUserSessionService implements UserSessionService {
       (req.method !== 'GET' ||
         req.headers.upgrade?.toLowerCase() === 'websocket') &&
       req.method !== 'HEAD' &&
-      !verifyRequestOrigin(req, [req.host, ...config.ALLOWED_ORIGINS])
+      !verifyRequestOrigin(req, [req.host, ...getConfig().ALLOWED_ORIGINS])
     ) {
       throw new ForbiddenError('Invalid Origin header');
     }
@@ -188,7 +190,7 @@ export class CookieUserSessionService implements UserSessionService {
       // Unsign the session cookie
       const sessionCookieResult = unsignObject(
         sessionCookieValue,
-        config.AUTH_SECRET,
+        getConfig().AUTH_SECRET,
       ) as SessionCookieValue | undefined;
       if (!sessionCookieResult) throw new InvalidSessionError();
 
@@ -218,8 +220,8 @@ export class CookieUserSessionService implements UserSessionService {
             expiresAt: sessionExpiryResult.newExpiry,
           },
         });
-        const newSignedCookie = signObject({ token }, config.AUTH_SECRET);
-        reply.setCookie(cookieName, newSignedCookie, COOKIE_OPTIONS);
+        const newSignedCookie = signObject({ token }, getConfig().AUTH_SECRET);
+        reply.setCookie(cookieName, newSignedCookie, getCookieOptions());
       }
 
       const { user } = userSession;
@@ -238,7 +240,7 @@ export class CookieUserSessionService implements UserSessionService {
     } catch (err) {
       // clear the cookie if it's invalid
       if (err instanceof InvalidSessionError && reply) {
-        reply.clearCookie(cookieName, COOKIE_OPTIONS);
+        reply.clearCookie(cookieName, getCookieOptions());
       }
       throw err;
     }
@@ -258,5 +260,3 @@ export class CookieUserSessionService implements UserSessionService {
     return this.getSessionInfoFromRequest(req, undefined);
   }
 }
-
-export const userSessionService = new CookieUserSessionService();

package/dist/local-auth/core/generators/auth-module/templates/module/utils/session-cookie.js

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { config } from '%configServiceImports';
+import { getConfig, isDevelopment } from '%configServiceImports';
 const COOKIE_NAME = 'user-session';
 /**
  * Retrieves the name of the session cookie based on the provided request.
@@ -10,9 +10,10 @@ const COOKIE_NAME = 'user-session';
  * @returns The name of the Iron session cookie.
  */
 export function getUserSessionCookieName(headers) {
-    if (config.APP_ENVIRONMENT !== 'dev') {
+    if (!isDevelopment()) {
         return `__Host-${COOKIE_NAME}`;
     }
+    const { SERVER_PORT } = getConfig();
     // in development, localhost does not support the __Host prefix and should be scoped to port
     // use origin/referer header to determine hostname because dev reverse proxies use origin/referer to signal the original host
     const { origin, referer } = headers;
@@ -20,18 +21,17 @@ export function getUserSessionCookieName(headers) {
     let port;
     try {
         if (!originalHost) {
-            port = config.SERVER_PORT;
+            port = SERVER_PORT;
         }
         else {
             const url = new URL(originalHost);
             const parsedPort = Number.parseInt(url.port, 10);
             // Validate port is in valid range (1-65535)
-            port =
-                parsedPort > 0 && parsedPort < 65_536 ? parsedPort : config.SERVER_PORT;
+            port = parsedPort > 0 && parsedPort < 65_536 ? parsedPort : SERVER_PORT;
         }
     }
     catch {
-        port = config.SERVER_PORT;
+        port = SERVER_PORT;
     }
     return `${COOKIE_NAME}-${port}`;
 }

package/dist/local-auth/core/generators/auth-module/templates/module/utils/session-cookie.ts

@@ -2,7 +2,7 @@
 
 import type { FastifyRequest } from 'fastify';
 
-import { config } from '%configServiceImports';
+import { getConfig, isDevelopment } from '%configServiceImports';
 
 const COOKIE_NAME = 'user-session';
 
@@ -17,9 +17,10 @@ const COOKIE_NAME = 'user-session';
 export function getUserSessionCookieName(
   headers: FastifyRequest['headers'],
 ): string {
-  if (config.APP_ENVIRONMENT !== 'dev') {
+  if (!isDevelopment()) {
     return `__Host-${COOKIE_NAME}`;
   }
+  const { SERVER_PORT } = getConfig();
   // in development, localhost does not support the __Host prefix and should be scoped to port
   // use origin/referer header to determine hostname because dev reverse proxies use origin/referer to signal the original host
   const { origin, referer } = headers;
@@ -27,16 +28,15 @@ export function getUserSessionCookieName(
   let port;
   try {
     if (!originalHost) {
-      port = config.SERVER_PORT;
+      port = SERVER_PORT;
     } else {
       const url = new URL(originalHost);
       const parsedPort = Number.parseInt(url.port, 10);
       // Validate port is in valid range (1-65535)
-      port =
-        parsedPort > 0 && parsedPort < 65_536 ? parsedPort : config.SERVER_PORT;
+      port = parsedPort > 0 && parsedPort < 65_536 ? parsedPort : SERVER_PORT;
     }
   } catch {
-    port = config.SERVER_PORT;
+    port = SERVER_PORT;
   }
   return `${COOKIE_NAME}-${port}`;
 }

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

@@ -1,7 +1,9 @@
 /**
  * Generator for auth routes for logging in and registering
  */
-export declare const authRoutesGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<Record<string, never>, {
+export declare const authRoutesGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
+    requireNameOnRegistration: boolean;
+}, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         authCoreAuthRoutesPaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").AuthCoreAuthRoutesPaths>;
     }, {
@@ -12,6 +14,8 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
     }, {
         apolloErrorImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             getApolloErrorCode: {};
+            getApolloErrorData: {};
+            getApolloErrorDetails: {};
         }>>;
         graphqlImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             '*': {};
@@ -45,10 +49,6 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             AutocompleteValue: {};
             Badge: {};
             badgeVariants: {};
-            BadgeWithIcon: {};
-            BadgeWithIconProps: {
-                isTypeOnly: true;
-            };
             Breadcrumb: {};
             BreadcrumbEllipsis: {};
             BreadcrumbItem: {};
@@ -68,7 +68,6 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
-            CheckedInput: {};
             CircularProgress: {};
             cn: {};
             Collapsible: {};
@@ -110,7 +109,13 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             DropdownMenuSubContent: {};
             DropdownMenuSubTrigger: {};
             DropdownMenuTrigger: {};
-            EmptyDisplay: {};
+            Empty: {};
+            EmptyContent: {};
+            EmptyDescription: {};
+            EmptyHeader: {};
+            EmptyMedia: {};
+            emptyMediaVariants: {};
+            EmptyTitle: {};
             ErrorableLoader: {};
             ErrorDisplay: {};
             Field: {};
@@ -140,11 +145,21 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             InputGroupText: {};
             InputGroupTextarea: {};
             inputVariants: {};
+            Item: {};
+            ItemActions: {};
+            ItemContent: {};
+            ItemDescription: {};
+            ItemFooter: {};
+            ItemGroup: {};
+            ItemHeader: {};
+            ItemMedia: {};
+            itemMediaVariants: {};
+            ItemSeparator: {};
+            ItemTitle: {};
+            itemVariants: {};
             Label: {};
-            LinkButton: {};
             Loader: {};
             mergeRefs: {};
-            Modal: {};
             MultiComboboxField: {};
             MultiComboboxFieldController: {};
             MultiComboboxFieldProps: {
@@ -162,19 +177,21 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             NavigationMenuList: {};
             NavigationMenuTrigger: {};
             navigationMenuTriggerStyle: {};
-            NavigationMenuViewport: {};
             NotFoundCard: {};
+            NumberField: {};
+            NumberFieldController: {};
             Popover: {};
-            PopoverAnchor: {};
             PopoverContent: {};
             PopoverTrigger: {};
-            ReactDatePickerInput: {};
-            ReactSelectInput: {};
+            RadioField: {};
+            RadioFieldController: {};
+            RadioOptionProps: {
+                isTypeOnly: true;
+            };
             ScrollArea: {};
             Select: {};
             SelectField: {};
             SelectFieldController: {};
-            SelectInput: {};
             SelectOptionProps: {
                 isTypeOnly: true;
             };
@@ -227,8 +244,6 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             Textarea: {};
             TextareaField: {};
             TextareaFieldController: {};
-            TextAreaInput: {};
-            TextInput: {};
             Toaster: {};
             Tooltip: {};
             TooltipContent: {};
@@ -258,6 +273,7 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
     }, undefined>;
     main: import("@baseplate-dev/sync").GeneratorTask<any, {
         renderers: import("@baseplate-dev/sync").ProviderType<import("./generated/template-renderers.js").AuthCoreAuthRoutesRenderers>;
+        paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").AuthCoreAuthRoutesPaths>;
     }, any>;
 }>;
 //# sourceMappingURL=auth-routes.generator.d.ts.map

package/dist/local-auth/core/generators/auth-routes/auth-routes.generator.js

@@ -1,7 +1,10 @@
+import { TsCodeUtils, tsImportBuilder, tsTemplateWithImports, } from '@baseplate-dev/core-generators';
 import { createGenerator, createGeneratorTask } from '@baseplate-dev/sync';
 import { z } from 'zod';
 import { AUTH_CORE_AUTH_ROUTES_GENERATED as GENERATED_TEMPLATES } from './generated/index.js';
-const descriptorSchema = z.object({});
+const descriptorSchema = z.object({
+    requireNameOnRegistration: z.boolean(),
+});
 /**
  * Generator for auth routes for logging in and registering
  */
@@ -9,18 +12,48 @@ export const authRoutesGenerator = createGenerator({
     name: 'auth/core/auth-routes',
     generatorFileUrl: import.meta.url,
     descriptorSchema,
-    buildTasks: () => ({
+    buildTasks: ({ requireNameOnRegistration }) => ({
         paths: GENERATED_TEMPLATES.paths.task,
         renderers: GENERATED_TEMPLATES.renderers.task,
         main: createGeneratorTask({
             dependencies: {
                 renderers: GENERATED_TEMPLATES.renderers.provider,
+                paths: GENERATED_TEMPLATES.paths.provider,
             },
-            run({ renderers }) {
+            run({ renderers, paths }) {
+                const schemaFields = {
+                    email: `z.email('Please enter a valid email address').transform((value) => value.toLowerCase())`,
+                    ...(requireNameOnRegistration
+                        ? { name: `z.string().min(1, 'Please enter your name').max(100)` }
+                        : {}),
+                    password: `z.string().min(PASSWORD_MIN_LENGTH, \`Password must be at least \${PASSWORD_MIN_LENGTH} characters\`).max(PASSWORD_MAX_LENGTH)`,
+                };
+                const registerSchema = tsTemplateWithImports(tsImportBuilder(['PASSWORD_MAX_LENGTH', 'PASSWORD_MIN_LENGTH']).from(paths.constants)) `z.object(${TsCodeUtils.mergeFragmentsAsObject(schemaFields)})`;
+                const inputFields = {
+                    email: 'data.email',
+                    ...(requireNameOnRegistration ? { name: 'data.name' } : {}),
+                    password: 'data.password',
+                };
+                const registerInput = TsCodeUtils.mergeFragmentsAsObjectPresorted(inputFields, { wrapWithParenthesis: false });
                 return {
                     build: async (builder) => {
                         await builder.apply(renderers.mainGroup.render({
-                            variables: {},
+                            variables: {
+                                register: {
+                                    TPL_REGISTER_SCHEMA: registerSchema,
+                                    TPL_REGISTER_INPUT: registerInput,
+                                    TPL_NAME_FORM_CONTROL: requireNameOnRegistration
+                                        ? `<InputFieldController
+              control={control}
+              name="name"
+              type="text"
+              autoComplete="name"
+              placeholder="Name"
+              label="Name"
+            />`
+                                        : '',
+                                },
+                            },
                         }));
                         await builder.apply(renderers.verifyEmail.render({}));
                     },