@baseplate-dev/plugin-auth 0.6.11 → 0.6.13

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

@@ -1,6 +1,9 @@
 // @ts-nocheck
 
-import type { RequestServiceContext } from '%requestServiceContextImports';
+import type {
+  RequestServiceContext,
+  RequestServiceContextWith,
+} from '%requestServiceContextImports';
 
 import { EMAIL_VERIFICATION_TOKEN_EXPIRY_SEC } from '$constantsPassword';
 import {
@@ -8,7 +11,6 @@ import {
   validateAuthVerification,
 } from '%authModuleImports';
 import { config } from '%configServiceImports';
-import { sendEmail } from '%emailModuleImports';
 import { BadRequestError } from '%errorHandlerServiceImports';
 import { prisma } from '%prismaImports';
 import { memoizeRateLimiter } from '%rateLimitImports';
@@ -52,8 +54,10 @@ export async function requestEmailVerification({
   context,
 }: {
   userId: string;
-  context: RequestServiceContext;
+  context: RequestServiceContextWith<'email'>;
 }): Promise<{ success: true }> {
+  const { services } = context;
+
   await Promise.all([
     getRequestEmailVerificationIpLimiter().consumeOrThrow(
       context.reqInfo.ip,
@@ -89,7 +93,7 @@ export async function requestEmailVerification({
   // Construct verification URL using configured domain
   const verifyLink = `${config.AUTH_FRONTEND_URL}/auth/verify-email?token=${encodeURIComponent(token)}`;
 
-  await sendEmail(TPL_ACCOUNT_VERIFICATION_EMAIL, {
+  await services.email.send(TPL_ACCOUNT_VERIFICATION_EMAIL, {
     to: user.email,
     data: { verifyLink },
   });

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

@@ -1,10 +1,10 @@
-import type { RequestServiceContext } from '%requestServiceContextImports';
+import type { RequestServiceContextWith } from '%requestServiceContextImports';
 /**
  * Request a password reset for the given email.
  */
 export declare function requestPasswordReset({ email: rawEmail, context, }: {
     email: string;
-    context: RequestServiceContext;
+    context: RequestServiceContextWith<'email'>;
 }): Promise<{
     success: true;
 }>;
@@ -31,7 +31,7 @@ export declare function validatePasswordResetToken({ token: rawToken, }: {
 export declare function completePasswordReset({ token: rawToken, newPassword: rawNewPassword, context, }: {
     token: string;
     newPassword: string;
-    context: RequestServiceContext;
+    context: RequestServiceContextWith<'email'>;
 }): Promise<{
     success: true;
 }>;

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

@@ -3,7 +3,6 @@ import { PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH, PASSWORD_RESET_TOKEN_EXPIRY_S
 import { resetLoginRateLimits } from '$servicesUserPassword';
 import { createAuthVerification, validateAuthVerification, } from '%authModuleImports';
 import { config } from '%configServiceImports';
-import { sendEmail } from '%emailModuleImports';
 import { BadRequestError, handleZodRequestValidationError, } from '%errorHandlerServiceImports';
 import { createPasswordHash } from '%passwordHasherServiceImports';
 import { prisma } from '%prismaImports';
@@ -39,6 +38,7 @@ const requestPasswordResetSchema = z.object({
  * Request a password reset for the given email.
  */
 export async function requestPasswordReset({ email: rawEmail, context, }) {
+    const { services } = context;
     const { email } = await requestPasswordResetSchema
         .parseAsync({ email: rawEmail })
         .catch(handleZodRequestValidationError);
@@ -61,7 +61,7 @@ export async function requestPasswordReset({ email: rawEmail, context, }) {
         // Construct reset URL using configured domain
         const resetLink = `${config.AUTH_FRONTEND_URL}/auth/reset-password?token=${encodeURIComponent(token)}`;
         // Send email asynchronously (queue-based)
-        await sendEmail(TPL_PASSWORD_RESET_EMAIL, {
+        await services.email.send(TPL_PASSWORD_RESET_EMAIL, {
             to: user.email,
             data: { resetLink },
         });
@@ -105,6 +105,7 @@ const completePasswordResetSchema = z.object({
  * - All remaining password-reset tokens for this user are deleted
  */
 export async function completePasswordReset({ token: rawToken, newPassword: rawNewPassword, context, }) {
+    const { services } = context;
     const { token, newPassword } = await completePasswordResetSchema
         .parseAsync({
         token: rawToken,
@@ -155,7 +156,7 @@ export async function completePasswordReset({ token: rawToken, newPassword: rawN
     // Reset login rate limits so the user can log in with their new password
     await resetLoginRateLimits({ email: user.email, ip: context.reqInfo.ip });
     // Send password changed confirmation email
-    await sendEmail(TPL_PASSWORD_CHANGED_EMAIL, {
+    await services.email.send(TPL_PASSWORD_CHANGED_EMAIL, {
         to: user.email,
         data: {},
     });

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

@@ -1,6 +1,6 @@
 // @ts-nocheck
 
-import type { RequestServiceContext } from '%requestServiceContextImports';
+import type { RequestServiceContextWith } from '%requestServiceContextImports';
 
 import {
   PASSWORD_MAX_LENGTH,
@@ -13,7 +13,6 @@ import {
   validateAuthVerification,
 } from '%authModuleImports';
 import { config } from '%configServiceImports';
-import { sendEmail } from '%emailModuleImports';
 import {
   BadRequestError,
   handleZodRequestValidationError,
@@ -69,8 +68,10 @@ export async function requestPasswordReset({
   context,
 }: {
   email: string;
-  context: RequestServiceContext;
+  context: RequestServiceContextWith<'email'>;
 }): Promise<{ success: true }> {
+  const { services } = context;
+
   const { email } = await requestPasswordResetSchema
     .parseAsync({ email: rawEmail })
     .catch(handleZodRequestValidationError);
@@ -110,7 +111,7 @@ export async function requestPasswordReset({
     const resetLink = `${config.AUTH_FRONTEND_URL}/auth/reset-password?token=${encodeURIComponent(token)}`;
 
     // Send email asynchronously (queue-based)
-    await sendEmail(TPL_PASSWORD_RESET_EMAIL, {
+    await services.email.send(TPL_PASSWORD_RESET_EMAIL, {
       to: user.email,
       data: { resetLink },
     });
@@ -172,8 +173,10 @@ export async function completePasswordReset({
 }: {
   token: string;
   newPassword: string;
-  context: RequestServiceContext;
+  context: RequestServiceContextWith<'email'>;
 }): Promise<{ success: true }> {
+  const { services } = context;
+
   const { token, newPassword } = await completePasswordResetSchema
     .parseAsync({
       token: rawToken,
@@ -232,7 +235,7 @@ export async function completePasswordReset({
   await resetLoginRateLimits({ email: user.email, ip: context.reqInfo.ip });
 
   // Send password changed confirmation email
-  await sendEmail(TPL_PASSWORD_CHANGED_EMAIL, {
+  await services.email.send(TPL_PASSWORD_CHANGED_EMAIL, {
     to: user.email,
     data: {},
   });

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

@@ -5,7 +5,6 @@ import { BadRequestError, handleZodRequestValidationError, logError, NotFoundErr
 import { createPasswordHash, verifyPasswordHash, } from '%passwordHasherServiceImports';
 import { prisma } from '%prismaImports';
 import { memoizeRateLimiter } from '%rateLimitImports';
-import { userSessionService } from '%userSessionServiceImports';
 import z from 'zod';
 const PROVIDER_ID = 'email-password';
 const emailPasswordSchema = z.object({
@@ -82,7 +81,7 @@ export async function registerUserWithEmailAndPassword({ input, context, }) {
     // Rate limit registration by IP
     await getRegistrationLimiter().consumeOrThrow(context.reqInfo.ip, 'Too many registration attempts. Please try again later.', 'registration-rate-limited');
     const user = await createUserWithEmailAndPassword({ input });
-    const session = await userSessionService.createSession(user.id, context);
+    const session = await context.services.userSession.createSession(user.id, context);
     // Send verification email (fire-and-forget, don't block registration)
     requestEmailVerification({ userId: user.id, context }).catch(logError);
     return { session, user };
@@ -122,7 +121,7 @@ export async function authenticateUserWithEmailAndPassword({ input, context, })
     }
     // Reset consecutive failures on successful login
     await getLoginConsecutiveFailsLimiter().delete(emailIpKey);
-    const session = await userSessionService.createSession(userAccount.userId, context);
+    const session = await context.services.userSession.createSession(userAccount.userId, context);
     return { session };
 }
 const changePasswordSchema = z.object({

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

@@ -19,7 +19,6 @@ import {
 } from '%passwordHasherServiceImports';
 import { prisma } from '%prismaImports';
 import { memoizeRateLimiter } from '%rateLimitImports';
-import { userSessionService } from '%userSessionServiceImports';
 import z from 'zod';
 
 const PROVIDER_ID = 'email-password';
@@ -140,7 +139,10 @@ export async function registerUserWithEmailAndPassword({
   );
 
   const user = await createUserWithEmailAndPassword({ input });
-  const session = await userSessionService.createSession(user.id, context);
+  const session = await context.services.userSession.createSession(
+    user.id,
+    context,
+  );
 
   // Send verification email (fire-and-forget, don't block registration)
   requestEmailVerification({ userId: user.id, context }).catch(logError);
@@ -215,7 +217,7 @@ export async function authenticateUserWithEmailAndPassword({
   // Reset consecutive failures on successful login
   await getLoginConsecutiveFailsLimiter().delete(emailIpKey);
 
-  const session = await userSessionService.createSession(
+  const session = await context.services.userSession.createSession(
     userAccount.userId,
     context,
   );

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

@@ -27,6 +27,7 @@ export declare const authEmailTemplatesGenerator: import("@baseplate-dev/sync").
             };
             EmailLayout: {};
             Heading: {};
+            Link: {};
             renderEmail: {};
             Section: {};
             Text: {};

package/dist/local-auth/core/generators/auth-email-templates/generated/index.d.ts

@@ -25,6 +25,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_GENERATED: {
                 };
                 EmailLayout: {};
                 Heading: {};
+                Link: {};
                 renderEmail: {};
                 Section: {};
                 Text: {};
@@ -47,6 +48,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_GENERATED: {
                 };
                 EmailLayout: {};
                 Heading: {};
+                Link: {};
                 renderEmail: {};
                 Section: {};
                 Text: {};
@@ -66,6 +68,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_GENERATED: {
                 };
                 EmailLayout: {};
                 Heading: {};
+                Link: {};
                 renderEmail: {};
                 Section: {};
                 Text: {};
@@ -85,6 +88,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_GENERATED: {
                 };
                 EmailLayout: {};
                 Heading: {};
+                Link: {};
                 renderEmail: {};
                 Section: {};
                 Text: {};

package/dist/local-auth/core/generators/auth-email-templates/generated/template-renderers.d.ts

@@ -30,6 +30,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_RENDERERS: {
             };
             EmailLayout: {};
             Heading: {};
+            Link: {};
             renderEmail: {};
             Section: {};
             Text: {};

package/dist/local-auth/core/generators/auth-email-templates/generated/typed-templates.d.ts

@@ -12,6 +12,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_TEMPLATES: {
             };
             EmailLayout: {};
             Heading: {};
+            Link: {};
             renderEmail: {};
             Section: {};
             Text: {};
@@ -31,6 +32,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_TEMPLATES: {
             };
             EmailLayout: {};
             Heading: {};
+            Link: {};
             renderEmail: {};
             Section: {};
             Text: {};
@@ -50,6 +52,7 @@ export declare const LOCAL_AUTH_AUTH_EMAIL_TEMPLATES_TEMPLATES: {
             };
             EmailLayout: {};
             Heading: {};
+            Link: {};
             renderEmail: {};
             Section: {};
             Text: {};

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

@@ -9,14 +9,14 @@ export declare const authModuleGenerator: import("@baseplate-dev/sync").Generato
     }, undefined>;
     imports: import("@baseplate-dev/sync").GeneratorTask<{
         authModuleImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            cleanupAuthVerificationQueue: {};
+            cleanupAuthVerificationWorker: {};
             cleanupExpiredAuthVerifications: {};
+            CookieUserSessionService: {};
             createAuthVerification: {};
             userSessionPayload: {};
             validateAuthVerification: {};
         }>>;
-        userSessionServiceImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            userSessionService: {};
-        }>>;
     }, {
         paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").LocalAuthCoreAuthModulePaths>;
     }, undefined>;
@@ -60,6 +60,7 @@ export declare const authModuleGenerator: import("@baseplate-dev/sync").Generato
             InternalServerError: {};
             logError: {};
             NotFoundError: {};
+            throwIfPrismaNotFound: {};
             TooManyRequestsError: {};
             UnauthorizedError: {};
         }>>;
@@ -76,14 +77,60 @@ export declare const authModuleGenerator: import("@baseplate-dev/sync").Generato
         prismaImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             prisma: {};
         }>>;
-        queueServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            createQueue: {};
+        queuesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            bindQueueHandler: {};
+            defineQueue: {};
+            EnqueueOptions: {
+                isTypeOnly: true;
+            };
+            QueueHandlerBinding: {
+                isTypeOnly: true;
+            };
+            QueueHandlerBindingConfig: {
+                isTypeOnly: true;
+            };
+            QueueHandlerBindingInput: {
+                isTypeOnly: true;
+            };
+            QueueInfo: {
+                isTypeOnly: true;
+            };
+            QueueIntrospection: {
+                isTypeOnly: true;
+            };
+            QueueJob: {
+                isTypeOnly: true;
+            };
+            QueueJobHandler: {
+                isTypeOnly: true;
+            };
+            QueueRuntime: {
+                isTypeOnly: true;
+            };
+            QueueService: {
+                isTypeOnly: true;
+            };
+            QueueToken: {
+                isTypeOnly: true;
+            };
+            QueueWorkers: {
+                isTypeOnly: true;
+            };
+            RepeatableConfig: {
+                isTypeOnly: true;
+            };
+            ScheduledJob: {
+                isTypeOnly: true;
+            };
         }>>;
         requestServiceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             createContextFromRequest: {};
             RequestServiceContext: {
                 isTypeOnly: true;
             };
+            RequestServiceContextWith: {
+                isTypeOnly: true;
+            };
         }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
         userSessionTypesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
@@ -108,9 +155,16 @@ export declare const authModuleGenerator: import("@baseplate-dev/sync").Generato
         prismaOutput: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/fastify-generators").PrismaOutputProvider>;
         renderers: import("@baseplate-dev/sync").ProviderType<import("./generated/template-renderers.js").LocalAuthCoreAuthModuleRenderers>;
         userObjectType: import("@baseplate-dev/sync").ProviderDependency<import("@baseplate-dev/fastify-generators").PothosTypeOutputProvider>;
-        queueConfig: import("@baseplate-dev/sync").ProviderDependency<Omit<import("@baseplate-dev/utils").FieldMap<{
-            queues: import("@baseplate-dev/utils").MapContainer<string, import("@baseplate-dev/core-generators").TsCodeFragment>;
-        }>, "getValues"> | undefined>;
+        appModule: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/fastify-generators").AppModuleProvider>;
+        paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").LocalAuthCoreAuthModulePaths>;
+    }, any>;
+    appRuntimeConfig: import("@baseplate-dev/sync").GeneratorTask<any, {
+        appRuntimeConfig: import("@baseplate-dev/sync").ProviderType<Omit<import("@baseplate-dev/utils").FieldMap<{
+            services: import("@baseplate-dev/utils").MapContainer<string, import("@baseplate-dev/core-generators").TsCodeFragment>;
+            construction: import("@baseplate-dev/utils").MapContainer<string, import("@baseplate-dev/fastify-generators").AppRuntimeConstructionEntry>;
+            flattenedModuleFields: import("@baseplate-dev/utils").MapContainer<string, string>;
+            usesBackgroundServices: import("@baseplate-dev/utils").ScalarContainer<boolean | undefined>;
+        }>, "getValues">>;
         paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").LocalAuthCoreAuthModulePaths>;
     }, any>;
 }>;

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

@@ -1,6 +1,5 @@
-import { tsCodeFragment, TsCodeUtils } from '@baseplate-dev/core-generators';
-import { appModuleProvider, configServiceProvider, createPothosPrismaObjectTypeOutputName, pothosTypeOutputProvider, prismaOutputProvider, } from '@baseplate-dev/fastify-generators';
-import { queueConfigProvider } from '@baseplate-dev/plugin-queue';
+import { tsCodeFragment, TsCodeUtils, tsTypeImportBuilder, } from '@baseplate-dev/core-generators';
+import { appModuleProvider, appRuntimeConfigProvider, configServiceProvider, createPothosPrismaObjectTypeOutputName, pothosTypeOutputProvider, prismaOutputProvider, } from '@baseplate-dev/fastify-generators';
 import { createGenerator, createGeneratorTask, createProviderTask, } from '@baseplate-dev/sync';
 import { quot } from '@baseplate-dev/utils';
 import { z } from 'zod';
@@ -56,10 +55,10 @@ export const authModuleGenerator = createGenerator({
                 userObjectType: pothosTypeOutputProvider
                     .dependency()
                     .reference(createPothosPrismaObjectTypeOutputName(LOCAL_AUTH_MODELS.user)),
-                queueConfig: queueConfigProvider.dependency().optional(),
+                appModule: appModuleProvider,
                 paths: GENERATED_TEMPLATES.paths.provider,
             },
-            run({ prismaOutput, renderers, userObjectType, queueConfig, paths }) {
+            run({ prismaOutput, renderers, userObjectType, appModule, paths }) {
                 return {
                     providers: {
                         authModule: {},
@@ -88,16 +87,27 @@ export const authModuleGenerator = createGenerator({
                                 },
                             },
                         }));
-                        // Render queue only if queue plugin is available
-                        if (queueConfig) {
-                            await builder.apply(renderers.queuesCleanupAuthVerification.render({}));
-                            // Register with` queue system
-                            queueConfig.queues.set('cleanup-auth-verification', TsCodeUtils.importFragment('cleanupAuthVerificationQueue', paths.queuesCleanupAuthVerification));
-                        }
+                        // Render queue
+                        await builder.apply(renderers.queuesCleanupAuthVerification.render({}));
+                        await builder.apply(renderers.queuesCleanupAuthVerificationWorker.render({}));
+                        // Register with the app module's queues field
+                        appModule.moduleFields.set('queues', 'cleanupAuthVerificationWorker', TsCodeUtils.importFragment('cleanupAuthVerificationWorker', paths.queuesCleanupAuthVerificationWorker));
                     },
                 };
             },
         }),
+        appRuntimeConfig: createGeneratorTask({
+            dependencies: {
+                appRuntimeConfig: appRuntimeConfigProvider,
+                paths: GENERATED_TEMPLATES.paths.provider,
+            },
+            run({ appRuntimeConfig, paths }) {
+                appRuntimeConfig.services.set('userSession', tsCodeFragment('CookieUserSessionService', tsTypeImportBuilder(['CookieUserSessionService']).from(paths.userSessionService)));
+                appRuntimeConfig.construction.set('userSession', {
+                    fragment: TsCodeUtils.template `new ${TsCodeUtils.importFragment('CookieUserSessionService', paths.userSessionService)}()`,
+                });
+            },
+        }),
     }),
 });
 //# sourceMappingURL=auth-module.generator.js.map