@baseplate-dev/plugin-auth 0.6.17 → 0.6.19

package/dist/better-auth/generators/fastify/better-auth-admin-module/generated/index.d.ts

@@ -1,5 +1,6 @@
 export declare const BETTER_AUTH_BETTER_AUTH_ADMIN_MODULE_GENERATED: {
     imports: {
+        generatorName: string;
         task: import("@baseplate-dev/sync").GeneratorTask<{
             betterAuthAdminModuleImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 resetUserPassword: {};

package/dist/better-auth/generators/fastify/better-auth-admin-module/generated/ts-import-providers.d.ts

@@ -9,6 +9,7 @@ export declare const betterAuthAdminModuleImportsProvider: import("@baseplate-de
     updateUserRoles: {};
 }>>;
 export declare const BETTER_AUTH_BETTER_AUTH_ADMIN_MODULE_IMPORTS: {
+    generatorName: string;
     task: import("@baseplate-dev/sync").GeneratorTask<{
         betterAuthAdminModuleImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             resetUserPassword: {};

package/dist/better-auth/generators/fastify/better-auth-admin-module/generated/ts-import-providers.js

@@ -25,6 +25,7 @@ const betterAuthBetterAuthAdminModuleImportsTask = createGeneratorTask({
     },
 });
 export const BETTER_AUTH_BETTER_AUTH_ADMIN_MODULE_IMPORTS = {
+    generatorName: '@baseplate-dev/plugin-auth#better-auth/better-auth-admin-module',
     task: betterAuthBetterAuthAdminModuleImportsTask,
 };
 //# sourceMappingURL=ts-import-providers.js.map

package/dist/better-auth/generators/fastify/better-auth-module/better-auth-module.generator.d.ts

@@ -1,7 +1,6 @@
 export declare const betterAuthModuleGenerator: import("@baseplate-dev/sync").GeneratorBundleCreator<{
     devBackendPort: number;
-    devWebDomainPort: number;
-    devWebPorts?: number[] | undefined;
+    webAppName: string;
 }, {
     paths: import("@baseplate-dev/sync").GeneratorTask<{
         betterAuthBetterAuthModulePaths: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-paths.js").BetterAuthBetterAuthModulePaths>;
@@ -43,6 +42,25 @@ export declare const betterAuthModuleGenerator: import("@baseplate-dev/sync").Ge
                 isTypeOnly: true;
             };
         }>>;
+        appSecretImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createSigner: {};
+            deriveKey: {};
+            SecretPolicy: {
+                isTypeOnly: true;
+            };
+            Signer: {
+                isTypeOnly: true;
+            };
+        }>>;
+        appUrlsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            getApiUrl: {};
+            getWebAppForUrl: {};
+            getWebOrigins: {};
+            getWebUrl: {};
+            WebAppName: {
+                isTypeOnly: true;
+            };
+        }>>;
         authContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AuthContext: {
                 isTypeOnly: true;
@@ -53,7 +71,6 @@ export declare const betterAuthModuleGenerator: import("@baseplate-dev/sync").Ge
             AuthUserSessionInfo: {
                 isTypeOnly: true;
             };
-            createAnonymousAuthContext: {};
             createAuthContextFromSessionInfo: {};
             createSystemAuthContext: {};
             InvalidSessionError: {};

package/dist/better-auth/generators/fastify/better-auth-module/better-auth-module.generator.js

@@ -2,31 +2,25 @@ import { createNodePackagesTask, extractPackageVersions, tsCodeFragment, TsCodeU
 import { appModuleProvider, appRuntimeConfigProvider, configServiceProvider, prismaOutputProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
 import { transactionalLibConfigProvider } from '@baseplate-dev/plugin-email';
 import { createGenerator, createGeneratorTask, createProviderTask, } from '@baseplate-dev/sync';
+import { quot } from '@baseplate-dev/utils';
 import { z } from 'zod';
 import { BETTER_AUTH_MODELS } from '#src/better-auth/constants/model-names.js';
 import { BETTER_AUTH_PACKAGES } from '#src/better-auth/constants/packages.js';
 import { BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED } from './generated/index.js';
 const descriptorSchema = z.object({
-    devWebPorts: z.array(z.number()).default([]),
     devBackendPort: z.number(),
-    devWebDomainPort: z.number(),
+    /** Web app the links in auth emails point at. */
+    webAppName: z.string(),
 });
 export const betterAuthModuleGenerator = createGenerator({
     name: 'better-auth/better-auth-module',
     generatorFileUrl: import.meta.url,
     descriptorSchema,
-    buildTasks: ({ devWebPorts, devBackendPort, devWebDomainPort }) => ({
+    buildTasks: ({ devBackendPort, webAppName }) => ({
         paths: BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED.paths.task,
         imports: BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED.imports.task,
         renderers: BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED.renderers.task,
         config: createProviderTask(configServiceProvider, (configService) => {
-            const betterAuthSecret = 'dev-secret-change-me-in-production';
-            configService.configFields.set('BETTER_AUTH_SECRET', {
-                validator: tsCodeFragment('z.string().min(32)'),
-                comment: 'Better Auth secret key for signing sessions',
-                seedValue: betterAuthSecret,
-                exampleValue: betterAuthSecret,
-            });
             const betterAuthUrl = `http://localhost:${String(devBackendPort)}`;
             configService.configFields.set('BETTER_AUTH_URL', {
                 validator: tsCodeFragment('z.url()'),
@@ -34,20 +28,6 @@ export const betterAuthModuleGenerator = createGenerator({
                 seedValue: betterAuthUrl,
                 exampleValue: betterAuthUrl,
             });
-            const allowedOrigins = devWebPorts
-                .map((p) => `http://localhost:${String(p)}`)
-                .join(',');
-            configService.configFields.set('ALLOWED_ORIGINS', {
-                validator: tsCodeFragment('z.string().default("")'),
-                comment: 'Comma-separated list of allowed CORS origins (e.g. https://example.com,https://app.example.com)',
-                seedValue: allowedOrigins,
-                exampleValue: allowedOrigins,
-            });
-            configService.configFields.set('AUTH_FRONTEND_URL', {
-                validator: tsCodeFragment('z.url()'),
-                comment: 'Frontend URL for authentication flows including password reset and email verification (e.g., https://app.example.com)',
-                exampleValue: `http://localhost:${devWebDomainPort}`,
-            });
         }),
         main: createGeneratorTask({
             dependencies: {
@@ -65,6 +45,7 @@ export const betterAuthModuleGenerator = createGenerator({
                     build: async (builder) => {
                         await builder.apply(renderers.auth.render({
                             variables: {
+                                TPL_AUTH_WEB_APP: quot(webAppName),
                                 TPL_USER_ROLE_MODEL: prismaOutput.getPrismaModelFragment(BETTER_AUTH_MODELS.userRole),
                                 TPL_PASSWORD_RESET_EMAIL: TsCodeUtils.importFragment('PasswordResetEmail', transactionalLibPackageName),
                                 TPL_ACCOUNT_VERIFICATION_EMAIL: TsCodeUtils.importFragment('AccountVerificationEmail', transactionalLibPackageName),

package/dist/better-auth/generators/fastify/better-auth-module/generated/index.d.ts

@@ -1,5 +1,6 @@
 export declare const BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED: {
     imports: {
+        generatorName: string;
         task: import("@baseplate-dev/sync").GeneratorTask<{
             betterAuthModuleImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 Auth: {
@@ -46,6 +47,25 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED: {
                     isTypeOnly: true;
                 };
             }>>;
+            appSecretImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                createSigner: {};
+                deriveKey: {};
+                SecretPolicy: {
+                    isTypeOnly: true;
+                };
+                Signer: {
+                    isTypeOnly: true;
+                };
+            }>>;
+            appUrlsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                getApiUrl: {};
+                getWebAppForUrl: {};
+                getWebOrigins: {};
+                getWebUrl: {};
+                WebAppName: {
+                    isTypeOnly: true;
+                };
+            }>>;
             authContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 AuthContext: {
                     isTypeOnly: true;
@@ -56,7 +76,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED: {
                 AuthUserSessionInfo: {
                     isTypeOnly: true;
                 };
-                createAnonymousAuthContext: {};
                 createAuthContextFromSessionInfo: {};
                 createSystemAuthContext: {};
                 InvalidSessionError: {};
@@ -124,9 +143,29 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED: {
     templates: {
         auth: import("@baseplate-dev/core-generators").TsTemplateFile<{
             TPL_ACCOUNT_VERIFICATION_EMAIL: {};
+            TPL_AUTH_WEB_APP: {};
             TPL_PASSWORD_RESET_EMAIL: {};
             TPL_USER_ROLE_MODEL: {};
         }, {
+            appSecretImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                createSigner: {};
+                deriveKey: {};
+                SecretPolicy: {
+                    isTypeOnly: true;
+                };
+                Signer: {
+                    isTypeOnly: true;
+                };
+            }>>;
+            appUrlsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                getApiUrl: {};
+                getWebAppForUrl: {};
+                getWebOrigins: {};
+                getWebUrl: {};
+                WebAppName: {
+                    isTypeOnly: true;
+                };
+            }>>;
             authRolesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 AUTH_ROLE_CONFIG: {};
                 AuthRole: {
@@ -212,7 +251,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_GENERATED: {
                 AuthUserSessionInfo: {
                     isTypeOnly: true;
                 };
-                createAnonymousAuthContext: {};
                 createAuthContextFromSessionInfo: {};
                 createSystemAuthContext: {};
                 InvalidSessionError: {};

package/dist/better-auth/generators/fastify/better-auth-module/generated/template-renderers.d.ts

@@ -38,6 +38,25 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_RENDERERS: {
                 isTypeOnly: true;
             };
         }>>;
+        appSecretImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createSigner: {};
+            deriveKey: {};
+            SecretPolicy: {
+                isTypeOnly: true;
+            };
+            Signer: {
+                isTypeOnly: true;
+            };
+        }>>;
+        appUrlsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            getApiUrl: {};
+            getWebAppForUrl: {};
+            getWebOrigins: {};
+            getWebUrl: {};
+            WebAppName: {
+                isTypeOnly: true;
+            };
+        }>>;
         authContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AuthContext: {
                 isTypeOnly: true;
@@ -48,7 +67,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_RENDERERS: {
             AuthUserSessionInfo: {
                 isTypeOnly: true;
             };
-            createAnonymousAuthContext: {};
             createAuthContextFromSessionInfo: {};
             createSystemAuthContext: {};
             InvalidSessionError: {};

package/dist/better-auth/generators/fastify/better-auth-module/generated/template-renderers.js

@@ -1,5 +1,5 @@
 import { typescriptFileProvider } from '@baseplate-dev/core-generators';
-import { appRuntimeImportsProvider, authContextImportsProvider, authRolesImportsProvider, configServiceImportsProvider, pothosImportsProvider, prismaImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
+import { appRuntimeImportsProvider, appSecretImportsProvider, appUrlsImportsProvider, authContextImportsProvider, authRolesImportsProvider, configServiceImportsProvider, pothosImportsProvider, prismaImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
 import { emailModuleImportsProvider } from '@baseplate-dev/plugin-email';
 import { createGeneratorTask, createProviderType } from '@baseplate-dev/sync';
 import { BETTER_AUTH_BETTER_AUTH_MODULE_PATHS } from './template-paths.js';
@@ -8,6 +8,8 @@ const betterAuthBetterAuthModuleRenderers = createProviderType('better-auth-bett
 const betterAuthBetterAuthModuleRenderersTask = createGeneratorTask({
     dependencies: {
         appRuntimeImports: appRuntimeImportsProvider,
+        appSecretImports: appSecretImportsProvider,
+        appUrlsImports: appUrlsImportsProvider,
         authContextImports: authContextImportsProvider,
         authRolesImports: authRolesImportsProvider,
         configServiceImports: configServiceImportsProvider,
@@ -21,7 +23,7 @@ const betterAuthBetterAuthModuleRenderersTask = createGeneratorTask({
     exports: {
         betterAuthBetterAuthModuleRenderers: betterAuthBetterAuthModuleRenderers.export(),
     },
-    run({ appRuntimeImports, authContextImports, authRolesImports, configServiceImports, emailModuleImports, paths, pothosImports, prismaImports, typescriptFile, userSessionTypesImports, }) {
+    run({ appRuntimeImports, appSecretImports, appUrlsImports, authContextImports, authRolesImports, configServiceImports, emailModuleImports, paths, pothosImports, prismaImports, typescriptFile, userSessionTypesImports, }) {
         return {
             providers: {
                 betterAuthBetterAuthModuleRenderers: {
@@ -30,6 +32,8 @@ const betterAuthBetterAuthModuleRenderersTask = createGeneratorTask({
                             template: BETTER_AUTH_BETTER_AUTH_MODULE_TEMPLATES.auth,
                             destination: paths.auth,
                             importMapProviders: {
+                                appSecretImports,
+                                appUrlsImports,
                                 authRolesImports,
                                 configServiceImports,
                                 emailModuleImports,

package/dist/better-auth/generators/fastify/better-auth-module/generated/ts-import-providers.d.ts

@@ -27,6 +27,7 @@ export declare const betterAuthModuleImportsProvider: import("@baseplate-dev/syn
     toWebHeaders: {};
 }>>;
 export declare const BETTER_AUTH_BETTER_AUTH_MODULE_IMPORTS: {
+    generatorName: string;
     task: import("@baseplate-dev/sync").GeneratorTask<{
         betterAuthModuleImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             Auth: {

package/dist/better-auth/generators/fastify/better-auth-module/generated/ts-import-providers.js

@@ -35,6 +35,7 @@ const betterAuthBetterAuthModuleImportsTask = createGeneratorTask({
     },
 });
 export const BETTER_AUTH_BETTER_AUTH_MODULE_IMPORTS = {
+    generatorName: '@baseplate-dev/plugin-auth#better-auth/better-auth-module',
     task: betterAuthBetterAuthModuleImportsTask,
 };
 //# sourceMappingURL=ts-import-providers.js.map

package/dist/better-auth/generators/fastify/better-auth-module/generated/typed-templates.d.ts

@@ -1,9 +1,29 @@
 export declare const BETTER_AUTH_BETTER_AUTH_MODULE_TEMPLATES: {
     auth: import("@baseplate-dev/core-generators").TsTemplateFile<{
         TPL_ACCOUNT_VERIFICATION_EMAIL: {};
+        TPL_AUTH_WEB_APP: {};
         TPL_PASSWORD_RESET_EMAIL: {};
         TPL_USER_ROLE_MODEL: {};
     }, {
+        appSecretImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createSigner: {};
+            deriveKey: {};
+            SecretPolicy: {
+                isTypeOnly: true;
+            };
+            Signer: {
+                isTypeOnly: true;
+            };
+        }>>;
+        appUrlsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            getApiUrl: {};
+            getWebAppForUrl: {};
+            getWebOrigins: {};
+            getWebUrl: {};
+            WebAppName: {
+                isTypeOnly: true;
+            };
+        }>>;
         authRolesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             AUTH_ROLE_CONFIG: {};
             AuthRole: {
@@ -89,7 +109,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_MODULE_TEMPLATES: {
             AuthUserSessionInfo: {
                 isTypeOnly: true;
             };
-            createAnonymousAuthContext: {};
             createAuthContextFromSessionInfo: {};
             createSystemAuthContext: {};
             InvalidSessionError: {};

package/dist/better-auth/generators/fastify/better-auth-module/generated/typed-templates.js

@@ -1,10 +1,12 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
-import { appRuntimeImportsProvider, authContextImportsProvider, authRolesImportsProvider, configServiceImportsProvider, pothosImportsProvider, prismaImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
+import { appRuntimeImportsProvider, appSecretImportsProvider, appUrlsImportsProvider, authContextImportsProvider, authRolesImportsProvider, configServiceImportsProvider, pothosImportsProvider, prismaImportsProvider, userSessionTypesImportsProvider, } from '@baseplate-dev/fastify-generators';
 import { emailModuleImportsProvider } from '@baseplate-dev/plugin-email';
 import path from 'node:path';
 const auth = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     importMapProviders: {
+        appSecretImports: appSecretImportsProvider,
+        appUrlsImports: appUrlsImportsProvider,
         authRolesImports: authRolesImportsProvider,
         configServiceImports: configServiceImportsProvider,
         emailModuleImports: emailModuleImportsProvider,
@@ -22,6 +24,7 @@ const auth = createTsTemplateFile({
     },
     variables: {
         TPL_ACCOUNT_VERIFICATION_EMAIL: {},
+        TPL_AUTH_WEB_APP: {},
         TPL_PASSWORD_RESET_EMAIL: {},
         TPL_USER_ROLE_MODEL: {},
     },

package/dist/better-auth/generators/fastify/better-auth-module/templates/module/services/auth.ts

@@ -3,6 +3,8 @@
 import type { AuthRole } from '%authRolesImports';
 import type { EmailService } from '%emailModuleImports';
 
+import { deriveKey } from '%appSecretImports';
+import { getWebAppForUrl, getWebOrigins, getWebUrl } from '%appUrlsImports';
 import { DEFAULT_USER_ROLES } from '%authRolesImports';
 import { getConfig } from '%configServiceImports';
 import { prisma } from '%prismaImports';
@@ -43,13 +45,17 @@ export type Auth = ReturnType<typeof buildAuth>;
 export const buildAuth = ({ email }: AuthServiceDeps) =>
   betterAuth({
     database: prismaAdapter(prisma, { provider: 'postgresql' }),
-    secret: config.BETTER_AUTH_SECRET,
+    secret: deriveKey('auth:better-auth:v1').toString('base64url'),
     baseURL: config.BETTER_AUTH_URL,
     basePath: '/auth',
     emailAndPassword: {
       enabled: true,
-      async sendResetPassword({ token, user }) {
-        const resetLink = `${config.AUTH_FRONTEND_URL}/auth/reset-password?token=${token}`;
+      async sendResetPassword({ token, user }, request) {
+        const resetLink = getWebUrl(
+          getWebAppForUrl(request?.headers.get('origin') ?? undefined) ??
+            TPL_AUTH_WEB_APP,
+          `/auth/reset-password?token=${token}`,
+        );
         await email.send(TPL_PASSWORD_RESET_EMAIL, {
           to: user.email,
           data: { resetLink },
@@ -59,8 +65,12 @@ export const buildAuth = ({ email }: AuthServiceDeps) =>
     },
     emailVerification: {
       sendOnSignUp: true,
-      async sendVerificationEmail({ token, user }) {
-        const verifyLink = `${config.AUTH_FRONTEND_URL}/auth/verify-email?token=${token}`;
+      async sendVerificationEmail({ token, user }, request) {
+        const verifyLink = getWebUrl(
+          getWebAppForUrl(request?.headers.get('origin') ?? undefined) ??
+            TPL_AUTH_WEB_APP,
+          `/auth/verify-email?token=${token}`,
+        );
         await email.send(TPL_ACCOUNT_VERIFICATION_EMAIL, {
           to: user.email,
           data: { verifyLink },
@@ -76,9 +86,7 @@ export const buildAuth = ({ email }: AuthServiceDeps) =>
         generateId: false,
       },
     },
-    trustedOrigins: config.ALLOWED_ORIGINS.split(',')
-      .map((o) => o.trim())
-      .filter(Boolean),
+    trustedOrigins: getWebOrigins(),
     user: {
       modelName: 'User',
       changeEmail: {

package/dist/better-auth/generators/react/better-auth-hooks/better-auth-hooks.generator.d.ts

@@ -12,8 +12,8 @@ export declare const betterAuthHooksGenerator: import("@baseplate-dev/sync").Gen
                 isTypeOnly: true;
             };
             useLogOut: {};
-            useRequiredUserId: {};
             useSession: {};
+            useUserIdOrThrow: {};
             AuthRole: {
                 isTypeOnly: true;
             };

package/dist/better-auth/generators/react/better-auth-hooks/generated/index.d.ts

@@ -1,13 +1,14 @@
 export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_GENERATED: {
     imports: {
+        generatorName: string;
         task: import("@baseplate-dev/sync").GeneratorTask<{
             authHooksImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
                 SessionData: {
                     isTypeOnly: true;
                 };
                 useLogOut: {};
-                useRequiredUserId: {};
                 useSession: {};
+                useUserIdOrThrow: {};
                 AuthRole: {
                     isTypeOnly: true;
                 };
@@ -55,9 +56,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_GENERATED: {
                     logError: {};
                 }>>;
             }, Record<never, Record<never, never>>>;
-            useRequiredUserId: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
-                useSession: {};
-            }>;
             useSession: import("@baseplate-dev/core-generators").TsTemplateFile<{
                 TPL_AUTH_ROLES: {};
             }, {
@@ -66,6 +64,9 @@ export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_GENERATED: {
                     AuthLoadedGate: {};
                 }>>;
             }, Record<never, Record<never, never>>>;
+            useUserIdOrThrow: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
+                useSession: {};
+            }>;
         };
     };
 };

package/dist/better-auth/generators/react/better-auth-hooks/generated/template-paths.d.ts

@@ -1,7 +1,7 @@
 export interface BetterAuthBetterAuthHooksPaths {
     useLogOut: string;
-    useRequiredUserId: string;
     useSession: string;
+    useUserIdOrThrow: string;
 }
 export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_PATHS: {
     provider: import("@baseplate-dev/sync").ProviderType<BetterAuthBetterAuthHooksPaths>;

package/dist/better-auth/generators/react/better-auth-hooks/generated/template-paths.js

@@ -12,8 +12,8 @@ const betterAuthBetterAuthHooksPathsTask = createGeneratorTask({
             providers: {
                 betterAuthBetterAuthHooksPaths: {
                     useLogOut: `${srcRoot}/hooks/use-log-out.ts`,
-                    useRequiredUserId: `${srcRoot}/hooks/use-required-user-id.ts`,
                     useSession: `${srcRoot}/hooks/use-session.ts`,
+                    useUserIdOrThrow: `${srcRoot}/hooks/use-user-id-or-throw.ts`,
                 },
             },
         };

package/dist/better-auth/generators/react/better-auth-hooks/generated/ts-import-providers.d.ts

@@ -1,12 +1,13 @@
 export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_IMPORTS: {
+    generatorName: string;
     task: import("@baseplate-dev/sync").GeneratorTask<{
         authHooksImports: import("@baseplate-dev/sync").ProviderExport<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             SessionData: {
                 isTypeOnly: true;
             };
             useLogOut: {};
-            useRequiredUserId: {};
             useSession: {};
+            useUserIdOrThrow: {};
             AuthRole: {
                 isTypeOnly: true;
             };

package/dist/better-auth/generators/react/better-auth-hooks/generated/ts-import-providers.js

@@ -14,14 +14,15 @@ const betterAuthBetterAuthHooksImportsTask = createGeneratorTask({
                     AuthRole: paths.useSession,
                     SessionData: paths.useSession,
                     useLogOut: paths.useLogOut,
-                    useRequiredUserId: paths.useRequiredUserId,
                     useSession: paths.useSession,
+                    useUserIdOrThrow: paths.useUserIdOrThrow,
                 }),
             },
         };
     },
 });
 export const BETTER_AUTH_BETTER_AUTH_HOOKS_IMPORTS = {
+    generatorName: '@baseplate-dev/plugin-auth#better-auth/better-auth-hooks',
     task: betterAuthBetterAuthHooksImportsTask,
 };
 //# sourceMappingURL=ts-import-providers.js.map

package/dist/better-auth/generators/react/better-auth-hooks/generated/typed-templates.d.ts

@@ -10,9 +10,6 @@ export declare const hooksGroup: {
             logError: {};
         }>>;
     }, Record<never, Record<never, never>>>;
-    useRequiredUserId: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
-        useSession: {};
-    }>;
     useSession: import("@baseplate-dev/core-generators").TsTemplateFile<{
         TPL_AUTH_ROLES: {};
     }, {
@@ -21,6 +18,9 @@ export declare const hooksGroup: {
             AuthLoadedGate: {};
         }>>;
     }, Record<never, Record<never, never>>>;
+    useUserIdOrThrow: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
+        useSession: {};
+    }>;
 };
 export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_TEMPLATES: {
     hooksGroup: {
@@ -35,9 +35,6 @@ export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_TEMPLATES: {
                 logError: {};
             }>>;
         }, Record<never, Record<never, never>>>;
-        useRequiredUserId: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
-            useSession: {};
-        }>;
         useSession: import("@baseplate-dev/core-generators").TsTemplateFile<{
             TPL_AUTH_ROLES: {};
         }, {
@@ -46,6 +43,9 @@ export declare const BETTER_AUTH_BETTER_AUTH_HOOKS_TEMPLATES: {
                 AuthLoadedGate: {};
             }>>;
         }, Record<never, Record<never, never>>>;
+        useUserIdOrThrow: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, {
+            useSession: {};
+        }>;
     };
 };
 //# sourceMappingURL=typed-templates.d.ts.map

package/dist/better-auth/generators/react/better-auth-hooks/generated/typed-templates.js

@@ -16,18 +16,6 @@ const useLogOut = createTsTemplateFile({
     },
     variables: {},
 });
-const useRequiredUserId = createTsTemplateFile({
-    fileOptions: { kind: 'singleton' },
-    group: 'hooks',
-    importMapProviders: {},
-    name: 'use-required-user-id',
-    projectExports: { useRequiredUserId: {} },
-    referencedGeneratorTemplates: { useSession: {} },
-    source: {
-        path: path.join(import.meta.dirname, '../templates/src/hooks/use-required-user-id.ts'),
-    },
-    variables: {},
-});
 const useSession = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'hooks',
@@ -43,6 +31,18 @@ const useSession = createTsTemplateFile({
     },
     variables: { TPL_AUTH_ROLES: {} },
 });
-export const hooksGroup = { useLogOut, useRequiredUserId, useSession };
+const useUserIdOrThrow = createTsTemplateFile({
+    fileOptions: { kind: 'singleton' },
+    group: 'hooks',
+    importMapProviders: {},
+    name: 'use-user-id-or-throw',
+    projectExports: { useUserIdOrThrow: {} },
+    referencedGeneratorTemplates: { useSession: {} },
+    source: {
+        path: path.join(import.meta.dirname, '../templates/src/hooks/use-user-id-or-throw.ts'),
+    },
+    variables: {},
+});
+export const hooksGroup = { useLogOut, useSession, useUserIdOrThrow };
 export const BETTER_AUTH_BETTER_AUTH_HOOKS_TEMPLATES = { hooksGroup };
 //# sourceMappingURL=typed-templates.js.map

package/dist/better-auth/generators/react/better-auth-hooks/templates/src/hooks/{use-required-user-id.ts → use-user-id-or-throw.ts}

@@ -2,7 +2,7 @@
 
 import { useSession } from '$useSession';
 
-export function useRequiredUserId(): string {
+export function useUserIdOrThrow(): string {
   const { userId } = useSession();
   if (!userId) {
     throw new Error('User is not authenticated');