@baseplate-dev/plugin-auth 0.6.12 → 0.6.13

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

@@ -18,7 +18,10 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_RENDERERS: {
         localAuthCoreAuthEmailPasswordRenderers: import("@baseplate-dev/sync").ProviderExport<LocalAuthCoreAuthEmailPasswordRenderers>;
     }, {
         authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            cleanupAuthVerificationQueue: {};
+            cleanupAuthVerificationWorker: {};
             cleanupExpiredAuthVerifications: {};
+            CookieUserSessionService: {};
             createAuthVerification: {};
             userSessionPayload: {};
             validateAuthVerification: {};
@@ -26,26 +29,6 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_RENDERERS: {
         configServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             config: {};
         }>>;
-        emailModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            EmailAdapter: {
-                isTypeOnly: true;
-            };
-            EmailAttachment: {
-                isTypeOnly: true;
-            };
-            EmailRawOptions: {
-                isTypeOnly: true;
-            };
-            EmailSendOptions: {
-                isTypeOnly: true;
-            };
-            sendEmail: {};
-            sendEmailQueue: {};
-            sendRawEmail: {};
-            TransformedEmailMessage: {
-                isTypeOnly: true;
-            };
-        }>>;
         errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             BadRequestError: {};
             ForbiddenError: {};
@@ -54,6 +37,7 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_RENDERERS: {
             InternalServerError: {};
             logError: {};
             NotFoundError: {};
+            throwIfPrismaNotFound: {};
             TooManyRequestsError: {};
             UnauthorizedError: {};
         }>>;
@@ -92,11 +76,11 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_RENDERERS: {
             RequestServiceContext: {
                 isTypeOnly: true;
             };
+            RequestServiceContextWith: {
+                isTypeOnly: true;
+            };
         }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
-        userSessionServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            userSessionService: {};
-        }>>;
         userSessionTypesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             UserSessionPayload: {
                 isTypeOnly: true;

package/dist/local-auth/core/generators/auth-email-password/generated/template-renderers.js

@@ -1,6 +1,5 @@
 import { typescriptFileProvider } from '@baseplate-dev/core-generators';
-import { configServiceImportsProvider, errorHandlerServiceImportsProvider, passwordHasherServiceImportsProvider, pothosImportsProvider, prismaGeneratedImportsProvider, prismaImportsProvider, requestServiceContextImportsProvider, userSessionServiceImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
-import { emailModuleImportsProvider } from '@baseplate-dev/plugin-email';
+import { configServiceImportsProvider, errorHandlerServiceImportsProvider, passwordHasherServiceImportsProvider, pothosImportsProvider, prismaGeneratedImportsProvider, prismaImportsProvider, requestServiceContextImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
 import { rateLimitImportsProvider } from '@baseplate-dev/plugin-rate-limit';
 import { createGeneratorTask, createProviderType } from '@baseplate-dev/sync';
 import { authModuleImportsProvider } from '#src/local-auth/core/generators/auth-module/generated/ts-import-providers.js';
@@ -11,7 +10,6 @@ const localAuthCoreAuthEmailPasswordRenderersTask = createGeneratorTask({
     dependencies: {
         authModuleImports: authModuleImportsProvider,
         configServiceImports: configServiceImportsProvider,
-        emailModuleImports: emailModuleImportsProvider,
         errorHandlerServiceImports: errorHandlerServiceImportsProvider,
         passwordHasherServiceImports: passwordHasherServiceImportsProvider,
         paths: LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_PATHS.provider,
@@ -21,13 +19,12 @@ const localAuthCoreAuthEmailPasswordRenderersTask = createGeneratorTask({
         rateLimitImports: rateLimitImportsProvider,
         requestServiceContextImports: requestServiceContextImportsProvider,
         typescriptFile: typescriptFileProvider,
-        userSessionServiceImports: userSessionServiceImportsProvider,
         userSessionTypesImports: userSessionTypesImportsProvider,
     },
     exports: {
         localAuthCoreAuthEmailPasswordRenderers: localAuthCoreAuthEmailPasswordRenderers.export(),
     },
-    run({ authModuleImports, configServiceImports, emailModuleImports, errorHandlerServiceImports, passwordHasherServiceImports, paths, pothosImports, prismaGeneratedImports, prismaImports, rateLimitImports, requestServiceContextImports, typescriptFile, userSessionServiceImports, userSessionTypesImports, }) {
+    run({ authModuleImports, configServiceImports, errorHandlerServiceImports, passwordHasherServiceImports, paths, pothosImports, prismaGeneratedImports, prismaImports, rateLimitImports, requestServiceContextImports, typescriptFile, userSessionTypesImports, }) {
         return {
             providers: {
                 localAuthCoreAuthEmailPasswordRenderers: {
@@ -38,7 +35,6 @@ const localAuthCoreAuthEmailPasswordRenderersTask = createGeneratorTask({
                             importMapProviders: {
                                 authModuleImports,
                                 configServiceImports,
-                                emailModuleImports,
                                 errorHandlerServiceImports,
                                 passwordHasherServiceImports,
                                 pothosImports,
@@ -46,7 +42,6 @@ const localAuthCoreAuthEmailPasswordRenderersTask = createGeneratorTask({
                                 prismaImports,
                                 rateLimitImports,
                                 requestServiceContextImports,
-                                userSessionServiceImports,
                                 userSessionTypesImports,
                             },
                             generatorPaths: paths,
@@ -71,7 +66,6 @@ const localAuthCoreAuthEmailPasswordRenderersTask = createGeneratorTask({
                             importMapProviders: {
                                 authModuleImports,
                                 configServiceImports,
-                                emailModuleImports,
                                 errorHandlerServiceImports,
                                 prismaImports,
                                 rateLimitImports,

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

@@ -12,7 +12,10 @@ export declare const moduleGroup: {
         TPL_USER_OBJECT_TYPE: {};
     }, {
         authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            cleanupAuthVerificationQueue: {};
+            cleanupAuthVerificationWorker: {};
             cleanupExpiredAuthVerifications: {};
+            CookieUserSessionService: {};
             createAuthVerification: {};
             userSessionPayload: {};
             validateAuthVerification: {};
@@ -28,7 +31,10 @@ export declare const moduleGroup: {
         TPL_PASSWORD_RESET_EMAIL: {};
     }, {
         authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            cleanupAuthVerificationQueue: {};
+            cleanupAuthVerificationWorker: {};
             cleanupExpiredAuthVerifications: {};
+            CookieUserSessionService: {};
             createAuthVerification: {};
             userSessionPayload: {};
             validateAuthVerification: {};
@@ -36,26 +42,6 @@ export declare const moduleGroup: {
         configServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             config: {};
         }>>;
-        emailModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            EmailAdapter: {
-                isTypeOnly: true;
-            };
-            EmailAttachment: {
-                isTypeOnly: true;
-            };
-            EmailRawOptions: {
-                isTypeOnly: true;
-            };
-            EmailSendOptions: {
-                isTypeOnly: true;
-            };
-            sendEmail: {};
-            sendEmailQueue: {};
-            sendRawEmail: {};
-            TransformedEmailMessage: {
-                isTypeOnly: true;
-            };
-        }>>;
         errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             BadRequestError: {};
             ForbiddenError: {};
@@ -64,6 +50,7 @@ export declare const moduleGroup: {
             InternalServerError: {};
             logError: {};
             NotFoundError: {};
+            throwIfPrismaNotFound: {};
             TooManyRequestsError: {};
             UnauthorizedError: {};
         }>>;
@@ -92,6 +79,9 @@ export declare const moduleGroup: {
             RequestServiceContext: {
                 isTypeOnly: true;
             };
+            RequestServiceContextWith: {
+                isTypeOnly: true;
+            };
         }>>;
     }, {
         constantsPassword: {};
@@ -108,6 +98,7 @@ export declare const moduleGroup: {
             InternalServerError: {};
             logError: {};
             NotFoundError: {};
+            throwIfPrismaNotFound: {};
             TooManyRequestsError: {};
             UnauthorizedError: {};
         }>>;
@@ -142,9 +133,9 @@ export declare const moduleGroup: {
             RequestServiceContext: {
                 isTypeOnly: true;
             };
-        }>>;
-        userSessionServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            userSessionService: {};
+            RequestServiceContextWith: {
+                isTypeOnly: true;
+            };
         }>>;
         userSessionTypesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             UserSessionPayload: {
@@ -174,7 +165,10 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
             TPL_USER_OBJECT_TYPE: {};
         }, {
             authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                cleanupAuthVerificationQueue: {};
+                cleanupAuthVerificationWorker: {};
                 cleanupExpiredAuthVerifications: {};
+                CookieUserSessionService: {};
                 createAuthVerification: {};
                 userSessionPayload: {};
                 validateAuthVerification: {};
@@ -190,7 +184,10 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
             TPL_PASSWORD_RESET_EMAIL: {};
         }, {
             authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                cleanupAuthVerificationQueue: {};
+                cleanupAuthVerificationWorker: {};
                 cleanupExpiredAuthVerifications: {};
+                CookieUserSessionService: {};
                 createAuthVerification: {};
                 userSessionPayload: {};
                 validateAuthVerification: {};
@@ -198,26 +195,6 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
             configServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 config: {};
             }>>;
-            emailModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-                EmailAdapter: {
-                    isTypeOnly: true;
-                };
-                EmailAttachment: {
-                    isTypeOnly: true;
-                };
-                EmailRawOptions: {
-                    isTypeOnly: true;
-                };
-                EmailSendOptions: {
-                    isTypeOnly: true;
-                };
-                sendEmail: {};
-                sendEmailQueue: {};
-                sendRawEmail: {};
-                TransformedEmailMessage: {
-                    isTypeOnly: true;
-                };
-            }>>;
             errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 BadRequestError: {};
                 ForbiddenError: {};
@@ -226,6 +203,7 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
                 InternalServerError: {};
                 logError: {};
                 NotFoundError: {};
+                throwIfPrismaNotFound: {};
                 TooManyRequestsError: {};
                 UnauthorizedError: {};
             }>>;
@@ -254,6 +232,9 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
                 RequestServiceContext: {
                     isTypeOnly: true;
                 };
+                RequestServiceContextWith: {
+                    isTypeOnly: true;
+                };
             }>>;
         }, {
             constantsPassword: {};
@@ -270,6 +251,7 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
                 InternalServerError: {};
                 logError: {};
                 NotFoundError: {};
+                throwIfPrismaNotFound: {};
                 TooManyRequestsError: {};
                 UnauthorizedError: {};
             }>>;
@@ -304,9 +286,9 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
                 RequestServiceContext: {
                     isTypeOnly: true;
                 };
-            }>>;
-            userSessionServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-                userSessionService: {};
+                RequestServiceContextWith: {
+                    isTypeOnly: true;
+                };
             }>>;
             userSessionTypesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 UserSessionPayload: {
@@ -332,7 +314,10 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
         TPL_ACCOUNT_VERIFICATION_EMAIL: {};
     }, {
         authModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            cleanupAuthVerificationQueue: {};
+            cleanupAuthVerificationWorker: {};
             cleanupExpiredAuthVerifications: {};
+            CookieUserSessionService: {};
             createAuthVerification: {};
             userSessionPayload: {};
             validateAuthVerification: {};
@@ -340,26 +325,6 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
         configServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             config: {};
         }>>;
-        emailModuleImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            EmailAdapter: {
-                isTypeOnly: true;
-            };
-            EmailAttachment: {
-                isTypeOnly: true;
-            };
-            EmailRawOptions: {
-                isTypeOnly: true;
-            };
-            EmailSendOptions: {
-                isTypeOnly: true;
-            };
-            sendEmail: {};
-            sendEmailQueue: {};
-            sendRawEmail: {};
-            TransformedEmailMessage: {
-                isTypeOnly: true;
-            };
-        }>>;
         errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             BadRequestError: {};
             ForbiddenError: {};
@@ -368,6 +333,7 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
             InternalServerError: {};
             logError: {};
             NotFoundError: {};
+            throwIfPrismaNotFound: {};
             TooManyRequestsError: {};
             UnauthorizedError: {};
         }>>;
@@ -392,6 +358,9 @@ export declare const LOCAL_AUTH_CORE_AUTH_EMAIL_PASSWORD_TEMPLATES: {
             RequestServiceContext: {
                 isTypeOnly: true;
             };
+            RequestServiceContextWith: {
+                isTypeOnly: true;
+            };
         }>>;
     }, {
         constantsPassword: {};

package/dist/local-auth/core/generators/auth-email-password/generated/typed-templates.js

@@ -1,6 +1,5 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
-import { configServiceImportsProvider, errorHandlerServiceImportsProvider, passwordHasherServiceImportsProvider, pothosImportsProvider, prismaGeneratedImportsProvider, prismaImportsProvider, requestServiceContextImportsProvider, userSessionServiceImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
-import { emailModuleImportsProvider } from '@baseplate-dev/plugin-email';
+import { configServiceImportsProvider, errorHandlerServiceImportsProvider, passwordHasherServiceImportsProvider, pothosImportsProvider, prismaGeneratedImportsProvider, prismaImportsProvider, requestServiceContextImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
 import { rateLimitImportsProvider } from '@baseplate-dev/plugin-rate-limit';
 import path from 'node:path';
 import { authModuleImportsProvider } from '#src/local-auth/core/generators/auth-module/generated/ts-import-providers.js';
@@ -50,7 +49,6 @@ const servicesPasswordReset = createTsTemplateFile({
     importMapProviders: {
         authModuleImports: authModuleImportsProvider,
         configServiceImports: configServiceImportsProvider,
-        emailModuleImports: emailModuleImportsProvider,
         errorHandlerServiceImports: errorHandlerServiceImportsProvider,
         passwordHasherServiceImports: passwordHasherServiceImportsProvider,
         prismaImports: prismaImportsProvider,
@@ -83,7 +81,6 @@ const servicesUserPassword = createTsTemplateFile({
         prismaImports: prismaImportsProvider,
         rateLimitImports: rateLimitImportsProvider,
         requestServiceContextImports: requestServiceContextImportsProvider,
-        userSessionServiceImports: userSessionServiceImportsProvider,
         userSessionTypesImports: userSessionTypesImportsProvider,
     },
     name: 'services-user-password',
@@ -123,7 +120,6 @@ const servicesEmailVerification = createTsTemplateFile({
     importMapProviders: {
         authModuleImports: authModuleImportsProvider,
         configServiceImports: configServiceImportsProvider,
-        emailModuleImports: emailModuleImportsProvider,
         errorHandlerServiceImports: errorHandlerServiceImportsProvider,
         prismaImports: prismaImportsProvider,
         rateLimitImports: rateLimitImportsProvider,

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

@@ -1,11 +1,11 @@
-import type { RequestServiceContext } from '%requestServiceContextImports';
+import type { RequestServiceContext, RequestServiceContextWith } from '%requestServiceContextImports';
 /**
  * Request an email verification for the authenticated user.
  * Sends a verification email with a link to verify.
  */
 export declare function requestEmailVerification({ userId, context, }: {
     userId: string;
-    context: RequestServiceContext;
+    context: RequestServiceContextWith<'email'>;
 }): Promise<{
     success: true;
 }>;

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

@@ -2,7 +2,6 @@
 import { EMAIL_VERIFICATION_TOKEN_EXPIRY_SEC } from '$constantsPassword';
 import { createAuthVerification, validateAuthVerification, } from '%authModuleImports';
 import { config } from '%configServiceImports';
-import { sendEmail } from '%emailModuleImports';
 import { BadRequestError } from '%errorHandlerServiceImports';
 import { prisma } from '%prismaImports';
 import { memoizeRateLimiter } from '%rateLimitImports';
@@ -30,6 +29,7 @@ const getVerifyEmailIpLimiter = memoizeRateLimiter('verify-email-ip', {
  * Sends a verification email with a link to verify.
  */
 export async function requestEmailVerification({ userId, context, }) {
+    const { services } = context;
     await Promise.all([
         getRequestEmailVerificationIpLimiter().consumeOrThrow(context.reqInfo.ip, 'Too many verification attempts. Please try again later.', 'too-many-requests'),
         getRequestEmailVerificationUserLimiter().consumeOrThrow(userId, 'Too many verification attempts. Please try again later.', 'too-many-requests'),
@@ -51,7 +51,7 @@ export async function requestEmailVerification({ userId, context, }) {
     });
     // 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/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: {};