added envvar for personal emails sent, added isHosted gate

Author: waleedlatif1

apps/sim/lib/auth/auth.ts

@@ -48,19 +48,18 @@ import {
   isAuthDisabled,
   isBillingEnabled,
   isEmailVerificationEnabled,
+  isHosted,
   isRegistrationDisabled,
 } from '@/lib/core/config/feature-flags'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
-import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import { getFromEmailAddress, getPersonalEmailFrom } from '@/lib/messaging/email/utils'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { createAnonymousSession, ensureAnonymousUserExists } from './anonymous'
 import { SSO_TRUSTED_PROVIDERS } from './sso/constants'
 
 const logger = createLogger('Auth')
 
-// Only initialize Stripe if the key is provided
-// This allows local development without a Stripe account
 const validStripeKey = env.STRIPE_SECRET_KEY
 
 let stripeClient = null
@@ -106,22 +105,21 @@ export const auth = betterAuth({
             })
           }
 
-          // Send welcome email
-          if (user.email) {
+          if (isHosted && user.email && user.emailVerified) {
             try {
-              const { sendEmail } = await import('@/lib/messaging/email/mailer')
               const html = await renderWelcomeEmail(user.name || undefined)
+              const { from, replyTo } = getPersonalEmailFrom()
 
               await sendEmail({
                 to: user.email,
                 subject: getEmailSubject('welcome'),
                 html,
-                from: 'Emir from Sim <emir@sim.ai>',
-                replyTo: 'emir@sim.ai',
+                from,
+                replyTo,
                 emailType: 'transactional',
               })
 
-              logger.info('[databaseHooks.user.create.after] Welcome email sent', {
+              logger.info('[databaseHooks.user.create.after] Welcome email sent to OAuth user', {
                 userId: user.id,
               })
             } catch (error) {
@@ -321,6 +319,35 @@ export const auth = betterAuth({
       ],
     },
   },
+  emailVerification: {
+    autoSignInAfterVerification: true,
+    afterEmailVerification: async (user) => {
+      if (isHosted && user.email) {
+        try {
+          const html = await renderWelcomeEmail(user.name || undefined)
+          const { from, replyTo } = getPersonalEmailFrom()
+
+          await sendEmail({
+            to: user.email,
+            subject: getEmailSubject('welcome'),
+            html,
+            from,
+            replyTo,
+            emailType: 'transactional',
+          })
+
+          logger.info('[emailVerification.afterEmailVerification] Welcome email sent', {
+            userId: user.id,
+          })
+        } catch (error) {
+          logger.error('[emailVerification.afterEmailVerification] Failed to send welcome email', {
+            userId: user.id,
+            error,
+          })
+        }
+      }
+    },
+  },
   emailAndPassword: {
     enabled: true,
     requireEmailVerification: isEmailVerificationEnabled,

apps/sim/lib/billing/webhooks/invoices.ts

@@ -17,6 +17,7 @@ import { setUsageLimitForCredits } from '@/lib/billing/credits/purchase'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
+import { getPersonalEmailFrom } from '@/lib/messaging/email/utils'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 
 const logger = createLogger('StripeInvoiceWebhooks')
@@ -138,6 +139,7 @@ async function getPaymentMethodDetails(
 
 /**
  * Send payment failure notification emails to affected users
+ * Note: This is only called when billing is enabled (Stripe plugin loaded)
  */
 async function sendPaymentFailureEmails(
   sub: { plan: string | null; referenceId: string },
@@ -202,10 +204,13 @@ async function sendPaymentFailureEmails(
           })
         )
 
+        const { from, replyTo } = getPersonalEmailFrom()
         await sendEmail({
           to: userToNotify.email,
           subject: 'Payment Failed - Action Required',
           html: emailHtml,
+          from,
+          replyTo,
           emailType: 'transactional',
         })
 

apps/sim/lib/core/config/env.ts

@@ -60,6 +60,7 @@ export const env = createEnv({
     EMAIL_VERIFICATION_ENABLED:            z.boolean().optional(),                 // Enable email verification for user registration and login (defaults to false)
     RESEND_API_KEY:                        z.string().min(1).optional(),           // Resend API key for transactional emails
     FROM_EMAIL_ADDRESS:                    z.string().min(1).optional(),           // Complete from address (e.g., "Sim <noreply@domain.com>" or "noreply@domain.com")
+    PERSONAL_EMAIL_FROM:                   z.string().min(1).optional(),           // From address for personalized emails (e.g., "Emir from Sim <emir@sim.ai>")
     EMAIL_DOMAIN:                          z.string().min(1).optional(),           // Domain for sending emails (fallback when FROM_EMAIL_ADDRESS not set)
     AZURE_ACS_CONNECTION_STRING:           z.string().optional(),                  // Azure Communication Services connection string
 

apps/sim/lib/messaging/email/utils.ts

@@ -11,3 +11,34 @@ export function getFromEmailAddress(): string {
   // Fallback to constructing from EMAIL_DOMAIN
   return `noreply@${env.EMAIL_DOMAIN || getEmailDomain()}`
 }
+
+/**
+ * Extract the email address from a "Name <email>" formatted string"
+ */
+export function extractEmailFromAddress(fromAddress: string): string | undefined {
+  const match = fromAddress.match(/<([^>]+)>/)
+  if (match) {
+    return match[1]
+  }
+  if (fromAddress.includes('@') && !fromAddress.includes('<')) {
+    return fromAddress.trim()
+  }
+  return undefined
+}
+
+/**
+ * Get the personal email from address and reply-to
+ */
+export function getPersonalEmailFrom(): { from: string; replyTo: string | undefined } {
+  const personalFrom = env.PERSONAL_EMAIL_FROM
+  if (personalFrom) {
+    return {
+      from: personalFrom,
+      replyTo: extractEmailFromAddress(personalFrom),
+    }
+  }
+  return {
+    from: getFromEmailAddress(),
+    replyTo: undefined,
+  }
+}