fix: first name in email

Author: brandonkachen

packages/integrations/src/knowledge.md

@@ -24,35 +24,13 @@ To add a new integration (e.g., for a service like Stripe, or another email prov
 ## Current Integrations
 
 ### Loops
--   **Purpose**: Handles sending transactional emails via the Loops.so API.
+-   **Purpose**: Handles sending transactional emails (e.g., invitations, welcome messages) via the Loops.so API.
 -   **Location**: `packages/integrations/src/loops/`
--   **Key Functions**:
-    -   `sendOrganizationInvitationEmail(data: LoopsEmailData)`
-    -   `sendOrganizationWelcomeEmail(data: LoopsEmailData)`
-    -   `sendBasicEmail(email: string, data: { subject: string, message: string })`
+-   **Key Functions**: Provides functions for sending various types of pre-defined and basic emails.
 -   **Environment Variables Required**:
     -   `LOOPS_API_KEY`: Your API key for Loops.so.
 
-## Usage Examples
-
-To use an integration in another package (e.g., `backend` or `web`):
-
-1.  Ensure the `packages/integrations` package is listed as a dependency in the `package.json` of the consuming package (using `workspace:*`).
-2.  Import the required functions or types:
-
-    ```typescript
-    import { sendOrganizationInvitationEmail, LoopsEmailData } from '@codebuff/integrations';
-
-    // ... later in your code
-    const emailData: LoopsEmailData = {
-      email: 'user@example.com',
-      organizationName: 'Awesome Org',
-      // ... other data
-    };
-    await sendOrganizationInvitationEmail(emailData);
-    ```
-
 ## Best Practices
--   Keep integration logic focused solely on interacting with the third-party service.
--   Avoid including business logic specific to `backend` or `web` within this package.
+-   Keep external integration logic focused solely on interacting with the third-party service.
+-   Avoid including business logic specific to `backend` or `web` within this package when dealing with external services.
 -   Use the shared `logger` from the `common` package for logging.

packages/integrations/src/loops/client.ts

@@ -1,5 +1,8 @@
 import { logger } from 'common/src/util/logger'
-import { LoopsClient, APIError } from 'loops' // Import LoopsClient and APIError
+import { LoopsClient, APIError } from 'loops'
+import db from 'common/db'
+import * as schema from 'common/db/schema'
+import { eq } from 'drizzle-orm'
 
 import type { LoopsEmailData, SendEmailResult } from './types'
 
@@ -114,17 +117,40 @@ export async function sendSignupEventToLoops(
 }
 
 export async function sendOrganizationInvitationEmail(
-  data: LoopsEmailData
+  data: LoopsEmailData // data no longer contains firstName
 ): Promise<SendEmailResult> {
+  let lookedUpFirstName: string = 'there' // Default to 'there'
+  try {
+    const inviteeUserRecord = await db
+      .select({ name: schema.user.name })
+      .from(schema.user)
+      .where(eq(schema.user.email, data.email.toLowerCase())) // Compare email case-insensitively
+      .limit(1)
+
+    if (inviteeUserRecord.length > 0 && inviteeUserRecord[0].name) {
+      lookedUpFirstName = inviteeUserRecord[0].name.split(' ')[0] || 'there'
+    }
+  } catch (error) {
+    logger.error(
+      {
+        email: data.email,
+        error,
+        source: 'sendOrganizationInvitationEmail-lookup',
+      },
+      'Error fetching user by email for invitation, using default name.'
+    )
+    // Continue with default name 'there'
+  }
+
   return sendTransactionalEmail(
     ORGANIZATION_INVITATION_TRANSACTIONAL_ID,
     data.email,
     {
-      firstName: data.firstName || '',
-      organizationName: data.organizationName || '',
-      inviterName: data.inviterName || '',
-      invitationUrl: data.invitationUrl || '',
-      role: data.role || 'member',
+      firstName: lookedUpFirstName, // Use the looked-up or default name
+      organizationName: data.organizationName || '', // data.organizationName is still expected
+      inviterName: data.inviterName || '', // data.inviterName is still expected
+      invitationUrl: data.invitationUrl || '', // data.invitationUrl is still expected
+      role: data.role || 'member', // data.role is still expected
     }
   )
 }

packages/integrations/src/loops/types.ts

@@ -1,26 +1,25 @@
 // Loops related types will go here
 
 export interface LoopsEmailData {
-  email: string;
-  firstName?: string;
-  lastName?: string;
-  organizationName?: string;
-  inviterName?: string;
-  invitationUrl?: string;
-  role?: string;
+  email: string
+  lastName?: string
+  organizationName: string
+  inviterName: string
+  invitationUrl: string
+  role?: string
   // For generic subject/message emails
-  subject?: string;
-  message?: string;
+  subject?: string
+  message?: string
 }
 
 export interface LoopsResponse {
-  success: boolean;
-  id?: string;
-  message?: string;
+  success: boolean
+  id?: string
+  message?: string
 }
 
 export interface SendEmailResult {
-  success: boolean;
-  error?: string;
-  loopsId?: string;
+  success: boolean
+  error?: string
+  loopsId?: string
 }

web/src/app/api/orgs/[orgId]/invitations/[email]/resend/route.ts

@@ -73,7 +73,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
       .where(eq(schema.user.id, session.user.id))
       .limit(1)
 
-    // Resend invitation email
+    // Send invitation email
     const invitationUrl = `${request.nextUrl.origin}/invites/${inviteRecord.token}`
     const emailResult = await sendOrganizationInvitationEmail({
       email: inviteRecord.email,

web/src/app/api/orgs/[orgId]/invitations/bulk/route.ts

@@ -46,7 +46,11 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
     const body: BulkInviteRequest = await request.json()
 
     // Validate input
-    if (!body.invitations || !Array.isArray(body.invitations) || body.invitations.length === 0) {
+    if (
+      !body.invitations ||
+      !Array.isArray(body.invitations) ||
+      body.invitations.length === 0
+    ) {
       return NextResponse.json(
         { error: 'Invitations array is required and must not be empty' },
         { status: 400 }
@@ -92,7 +96,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
     const { organization } = permissionResult
 
     // Get all emails to check for existing members and invitations
-    const emails = body.invitations.map(inv => inv.email)
+    const emails = body.invitations.map((inv) => inv.email)
 
     // Check for existing members
     const existingMembers = await db
@@ -106,7 +110,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
         )
       )
 
-    const existingMemberEmails = new Set(existingMembers.map(m => m.email))
+    const existingMemberEmails = new Set(existingMembers.map((m) => m.email))
 
     // Check for existing pending invitations
     const existingInvitations = await db
@@ -120,7 +124,9 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
         )
       )
 
-    const existingInvitationEmails = new Set(existingInvitations.map(i => i.email))
+    const existingInvitationEmails = new Set(
+      existingInvitations.map((i) => i.email)
+    )
 
     // Get inviter information
     const inviter = await db
@@ -143,7 +149,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
           results.push({
             email: invitation.email,
             success: false,
-            error: 'User is already a member of this organization'
+            error: 'User is already a member of this organization',
           })
           failed++
           continue
@@ -154,7 +160,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
           results.push({
             email: invitation.email,
             success: false,
-            error: 'Invitation already sent to this email'
+            error: 'Invitation already sent to this email',
           })
           failed++
           continue
@@ -177,6 +183,8 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
           })
           .returning()
 
+
+
         // Send invitation email
         const invitationUrl = `${request.nextUrl.origin}/invites/${token}`
         const emailResult = await sendOrganizationInvitationEmail({
@@ -196,7 +204,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
           results.push({
             email: invitation.email,
             success: false,
-            error: 'Failed to send invitation email'
+            error: 'Failed to send invitation email',
           })
           failed++
           continue
@@ -205,20 +213,19 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
         results.push({
           email: invitation.email,
           success: true,
-          invitationId: inviteRecord.id
+          invitationId: inviteRecord.id,
         })
         successful++
-
       } catch (error) {
         logger.error(
           { organizationId: orgId, email: invitation.email, error },
           'Error processing bulk invitation'
         )
-        
+
         results.push({
           email: invitation.email,
           success: false,
-          error: 'Internal error processing invitation'
+          error: 'Internal error processing invitation',
         })
         failed++
       }
@@ -242,7 +249,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
         total: body.invitations.length,
         successful,
         failed,
-      }
+      },
     }
 
     return NextResponse.json(response)
@@ -256,4 +263,4 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
       { status: 500 }
     )
   }
-}
+}

web/src/app/api/orgs/[orgId]/invitations/route.ts

@@ -5,7 +5,7 @@ import db from 'common/db'
 import * as schema from 'common/db/schema'
 import { eq, and, isNull } from 'drizzle-orm'
 import { checkOrganizationPermission } from '@/lib/organization-permissions'
-import { sendOrganizationInvitationEmail } from '@codebuff/integrations' // Updated import
+import { sendOrganizationInvitationEmail } from '@codebuff/integrations'
 import { logger } from '@/util/logger'
 import crypto from 'crypto'
 
@@ -16,6 +16,7 @@ interface RouteParams {
 interface InviteRequest {
   email: string
   role: 'admin' | 'member'
+  // Removed firstName, as we will fetch it from the DB or default it
 }
 
 export async function POST(request: NextRequest, { params }: RouteParams) {