better-auth-studio 1.0.59-beta.12 → 1.0.59-beta.14

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAeA,OAAO,EAA+B,MAAM,EAAE,MAAM,SAAS,CAAC;AAS9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA+D9C,wBAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAqLhG;AAeD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CA4wLR"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAeA,OAAO,EAA+B,MAAM,EAAE,MAAM,SAAS,CAAC;AAS9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA+D9C,wBAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAqLhG;AAeD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAkzLR"}

package/dist/routes.js

@@ -5122,14 +5122,11 @@ export const authClient = createAuthClient({
             }
             const envPath = join(process.cwd(), '.env');
             const envLocalPath = join(process.cwd(), '.env.local');
-            // Try .env.local first, then .env
             const targetPath = existsSync(envLocalPath) ? envLocalPath : envPath;
             const envContent = existsSync(targetPath) ? readFileSync(targetPath, 'utf-8') : '';
-            // Generate environment variable names
             const providerUpper = provider.toUpperCase();
             const clientIdKey = `${providerUpper}_CLIENT_ID`;
             const clientSecretKey = `${providerUpper}_CLIENT_SECRET`;
-            // Parse existing .env file
             const envLines = envContent.split('\n');
             const existingCredentials = {};
             envLines.forEach((line) => {
@@ -5291,7 +5288,6 @@ export const authClient = createAuthClient({
             });
         }
     });
-    // Apply org invitation email template into examples auth.ts
     router.post('/api/tools/apply-email-template', async (req, res) => {
         try {
             const { subject, html, templateId } = req.body || {};
@@ -5307,13 +5303,10 @@ export const authClient = createAuthClient({
             let fileContent = readFileSync(authPath, 'utf-8');
             const escapedSubject = subject.replace(/`/g, '\\`').replace(/\${/g, '\\${');
             const escapedHtml = html.replace(/`/g, '\\`').replace(/\${/g, '\\${');
-            // Ensure Resend import
             if (!fileContent.includes("from 'resend'")) {
                 fileContent = `import { Resend } from 'resend';\n` + fileContent;
             }
-            // Ensure resend instance
             if (!fileContent.includes('const resend = new Resend(')) {
-                // place after imports
                 const importBlockEnd = fileContent.indexOf('\n', fileContent.lastIndexOf('import'));
                 if (importBlockEnd > -1) {
                     fileContent =
@@ -5329,60 +5322,107 @@ export const authClient = createAuthClient({
                 'password-reset': {
                     regex: /sendResetPassword\s*:\s*async\s*\([^)]*\)\s*=>\s*\{[\s\S]*?\},?/,
                     fn: `sendResetPassword: async ({ user, url, token }, request) => {
+        const subject = \\\`${escapedSubject}\\\`
+          .replace(/{{user.name}}/g, user?.name || '')
+          .replace(/{{user.email}}/g, user?.email || '');
+
+        const html = \\\`${escapedHtml}\\\`
+          .replace(/{{user.name}}/g, user?.name || '')
+          .replace(/{{user.email}}/g, user?.email || '')
+          .replace(/{{url}}/g, url || '')
+          .replace(/{{token}}/g, token || '');
+
         void sendEmail({
           to: user.email,
-          subject: "Reset your password",
-          text: \\\`Click the link to reset your password: \\\${url}\\\`,
+          subject,
+          html,
         });
       }`,
                 },
                 'email-verification': {
                     regex: /sendVerificationEmail\s*:\s*async\s*\([^)]*\)\s*=>\s*\{[\s\S]*?\},?/,
                     fn: `sendVerificationEmail: async ({ user, url, token }, request) => {
+        const subject = \\\`${escapedSubject}\\\`
+          .replace(/{{user.name}}/g, user?.name || '')
+          .replace(/{{user.email}}/g, user?.email || '');
+
+        const html = \\\`${escapedHtml}\\\`
+          .replace(/{{user.name}}/g, user?.name || '')
+          .replace(/{{user.email}}/g, user?.email || '')
+          .replace(/{{url}}/g, url || '')
+          .replace(/{{token}}/g, token || '');
+
         void sendEmail({
           to: user.email,
-          subject: "Verify your email address",
-          text: \\\`Click the link to verify your email: \\\${url}\\\`,
+          subject,
+          html,
         });
       }`,
                 },
                 'magic-link': {
                     regex: /sendMagicLink\s*:\s*async\s*\([^)]*\)\s*=>\s*\{[\s\S]*?\},?/,
                     fn: `sendMagicLink: async ({ email, token, url }, ctx) => {
+        const subject = \\\`${escapedSubject}\\\`
+          .replace(/{{user.email}}/g, email || '');
+
+        const html = \\\`${escapedHtml}\\\`
+          .replace(/{{user.email}}/g, email || '')
+          .replace(/{{url}}/g, url || '')
+          .replace(/{{token}}/g, token || '');
+
         void sendEmail({
           to: email,
-          subject: "Sign in to your account",
-          text: \\\`Click the link to sign in: \\\${url}\\\`,
+          subject,
+          html,
         });
       }`,
                 },
                 'org-invitation': {
                     regex: /sendInvitationEmail\s*:\s*async\s*\([^)]*\)\s*=>\s*\{[\s\S]*?\},?/,
-                    fn: `sendInvitationEmail: async ({ data, request }) => {
+                    fn: `sendInvitationEmail: async ({ data, request }: {
+        data: {
+          invitation: {
+            id: string;
+            organizationId: string;
+            email: string;
+            role: string;
+            status: "pending" | "accepted" | "rejected" | "canceled";
+            inviterId: string;
+            expiresAt: Date;
+            createdAt: Date;
+            teamId?: string | null | undefined;
+          };
+          organization: { name?: string; slug?: string };
+          inviter: { user: { name?: string; email?: string } };
+        };
+        request?: Request;
+      }) => {
         const { invitation, organization, inviter } = data;
-        const url =
-          (invitation as any)?.url ||
-          (invitation as any)?.link ||
-          request?.url ||
-          invitation.id;
+        const baseUrl = process.env.BETTER_AUTH_URL || 'http://localhost:3000';
+        const url = \\\`\\\${baseUrl}/accept-invitation?id=\\\${invitation.id}\\\`;
 
         const subject = \\\`${escapedSubject}\\\`
           .replace(/{{organization.name}}/g, organization?.name || '')
           .replace(/{{invitation.role}}/g, invitation.role || '')
           .replace(/{{inviter.user.name}}/g, inviter?.user?.name || '')
-          .replace(/{{inviter.user.email}}/g, inviter?.user?.email || '');
+          .replace(/{{inviter.user.email}}/g, inviter?.user?.email || '')
+          .replace(/{{invitation.email}}/g, invitation.email || '');
 
         const html = \\\`${escapedHtml}\\\`
           .replace(/{{invitation.url}}/g, url)
           .replace(/{{invitation.role}}/g, invitation.role || '')
           .replace(/{{organization.name}}/g, organization?.name || '')
+          .replace(/{{organization.slug}}/g, organization?.slug || '')
           .replace(/{{inviter.user.name}}/g, inviter?.user?.name || '')
-          .replace(/{{inviter.user.email}}/g, inviter?.user?.email || '');
+          .replace(/{{inviter.user.email}}/g, inviter?.user?.email || '')
+          .replace(/{{invitation.email}}/g, invitation.email || '')
+          .replace(/{{invitation.expiresAt}}/g, invitation.expiresAt?.toLocaleString() || '')
+          .replace(/{{expiresIn}}/g, invitation.expiresAt ? \\\`\\\${Math.ceil((invitation.expiresAt.getTime() - Date.now()) / (1000 * 60 * 60 * 24))} days\\\` : '');
 
-        await sendEmail({
+        void sendEmail({
           to: invitation.email,
           subject,
-          text: url,
+          html,
         });
       }`,
                 },
@@ -5393,19 +5433,17 @@ export const authClient = createAuthClient({
                     .status(400)
                     .json({ success: false, message: 'Unsupported templateId for apply' });
             }
-            // ensure sendEmail helper exists
             if (!fileContent.includes('const sendEmail = async')) {
                 const insertPoint = fileContent.indexOf('export const auth');
                 fileContent =
                     fileContent.slice(0, insertPoint) +
-                        `const sendEmail = async ({ to, subject, text }: { to: string; subject: string; text: string }) => {\n  console.log(\`Sending email to \${to} | \${subject} | \${text}\`);\n};\n\n` +
+                        `const sendEmail = async ({ to, subject, text, html }: { to: string; subject: string; text?: string; html?: string }) => {\n  console.log(\`Sending email to \${to} | \${subject}\`);\n  if (text) console.log('Text content:', text);\n  if (html) console.log('HTML content:', html);\n};\n\n` +
                         fileContent.slice(insertPoint);
             }
             if (handler.regex.test(fileContent)) {
                 fileContent = fileContent.replace(handler.regex, `${handler.fn},`);
             }
             else {
-                // try to inject into emailAndPassword or organization plugin based on template
                 if (templateId === 'org-invitation') {
                     const orgPluginRegex = /organization\(\s*\{\s*/;
                     if (!orgPluginRegex.test(fileContent)) {