Staging (Mail-0#750)

* draft fixes:
- added cc and bcc when saving drafts
- save drafts less aggresively

* some fixes for saving attachments to draft

* fix for empty draft loading

* fix draft list recipient name/address

* also show 'No Recipient' if empty

* remove comments

* switch to mimetext for draft saving to keep formatting consistent

* add message title to draft list

* feat: single api for oauth connections

* fix: add extra error handling

* chore: simplify and fix the dev env

* Ai generate security (Mail-0#706)

* Create prompts with XML formatting

* Include XML formatted prompts in generate func

* remove unused regex and add helper functions/warnings

* error handling

* Update apps/mail/lib/prompts.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* lint issues

* Update prompts.ts

* Mail-0#706 (comment)

Coderabbit fix 1

* erabbitai bot 3 days ago ⚠️ Potential issue  errorOccurred state is stale inside finally  React state setters (setErrorOccurred) are asynchronous; the errorOccurred value captured at render time will not yet reflect changes made earlier in the same event loop. Consequently, the logic deciding whether to collapse/expand may run with an outdated flag.  -  } finally { -      setIsLoading(false); -      if (!errorOccurred || isAskingQuestion) { -        setIsExpanded(true); -      } else { -        setIsExpanded(false); // Collapse on errors -      } -  } +  } finally { +      setIsLoading(false); +      // Use a local flag to track errors deterministically +      const hadError = isAskingQuestion ? false : !!errorFlagRef.current; +      setIsExpanded(!hadError); +  } You can create const errorFlagRef = useRef(false); and update errorFlagRef.current = true every time an error is detected, ensuring reliable behaviour irrespective of React batching.  Committable suggestion skipped: line range outside the PR's diff.

* Mail-0#706 (comment)

* Mail-0#706 (comment)

* Mail-0#706 (comment)

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Add a new Vietnamese translation file to support Vietnamese language users (Mail-0#726)

* feat(i18n): add Vietnamese language support

Add Vietnamese ('vi') to the list of supported languages in the
i18n configuration and JSON file to expand language options.

* Add a new Vietnamese translation file to support Vietnamese language users.

* Clear Vietnamese translation strings

* Update es.json (Mail-0#710)

Co-authored-by: needle <122770437+needleXO@users.noreply.github.com>

* Update app manifest and add new icons for PWA (Mail-0#739)

* feat: allow sending from email aliases added through gmail (Mail-0#743)

* Refactor IP handling in early-access routes

* Add unauthorized error handling in sign out function

* Redirect from Home Page on Session (Mail-0#701)

* Updated lockfile

* Updated home page session validation

---------

Co-authored-by: Adam <x_1337@outlook.com>

* Refactor settings handling and golden ticket logic

* Feat: og:image Generation on /compose route (Mail-0#730)

* Create route og image

* resolve coderabbit nitpicks

---------

Co-authored-by: Adam <x_1337@outlook.com>

* Update session check to include user id before redirecting

* Fix unauthorized error handling in multiple actions

* Enable shortcuts settings in navigation

* Refactor error handling to return unauthorized gracefully

* Update Hero component with new imports and link adjustments

* Update redirect URL to use hostname from req object

* Fix redirect URL formatting and add log for missing user ID

* Fix error handling in API routes for unauthorized requests

* Refactor throwUnauthorizedGracefully function for readability

* Fix error handling in driver routes

* Handle unauthorized gracefully when getting connections

* Refactor mail actions for better error handling

* Refactor deleteActiveConnection function for readability

* fixed (Mail-0#752)

* Refactor error handling in mail actions to return null or specific error messages instead of throwing unauthorized errors. This improves readability and maintains functionality across various actions.

* Update Google auth provider configuration

* Delete connection and update hero text

* Refactor error handling to use StandardizedError class

* Refactor error handling for Google API driver

---------

Co-authored-by: Ahmet Kilinc <akx9@icloud.com>
Co-authored-by: BlankParticle <blankparticle@gmail.com>
Co-authored-by: grim <75869731+ripgrim@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Chánh Đại <dai@chanhdai.com>
Co-authored-by: Dani B. <danibaldomirm@gmail.com>
Co-authored-by: needle <122770437+needleXO@users.noreply.github.com>
Co-authored-by: Humber Nieto <56887259+humbernieto@users.noreply.github.com>
Co-authored-by: Atharva Deosthale <atharva.deosthale17@gmail.com>
Co-authored-by: Nikita Drokin <86173808+nikitadrokin@users.noreply.github.com>

Author: 11 people

apps/mail/actions/ai-reply.ts

@@ -1,6 +1,5 @@
 'use server';
 
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { generateCompletions } from '@/lib/groq';
 import { headers } from 'next/headers';
 import { auth } from '@/lib/auth';
@@ -13,9 +12,7 @@ export async function generateAIResponse(
   const headersList = await headers();
   const session = await auth.api.getSession({ headers: headersList });
 
-  if (!session?.user) {
-    return throwUnauthorizedGracefully();
-  }
+  if (!session?.user) return '';
 
   if (!process.env.GROQ_API_KEY) {
     throw new Error('Groq API key is not configured');

apps/mail/actions/brain.ts

@@ -1,5 +1,4 @@
 'use server';
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { getActiveConnection } from './utils';
 import axios from 'axios';
 
@@ -11,7 +10,7 @@ export const EnableBrain = async () => {
   const connection = await getActiveConnection();
 
   if (!connection?.accessToken || !connection.refreshToken) {
-    return throwUnauthorizedGracefully();
+    return;
   }
 
   return await axios.put(process.env.BRAIN_URL + `/subscribe/${connection.providerId}`, {

apps/mail/actions/connections.ts

@@ -1,8 +1,7 @@
 'use server';
 
-import { getAuthenticatedUserId, throwUnauthorizedGracefully } from '@/app/api/utils';
+import { getAuthenticatedUserId } from '@/app/api/utils';
 import { connection, user } from '@zero/db/schema';
-import { type IConnection } from '@/types';
 import { headers } from 'next/headers';
 import { and, eq } from 'drizzle-orm';
 import { auth } from '@/lib/auth';
@@ -14,13 +13,13 @@ export async function deleteConnection(connectionId: string) {
     const session = await auth.api.getSession({ headers: headersList });
 
     if (!session) {
-      return throwUnauthorizedGracefully();
+      return { success: false, error: 'Session not found' };
     }
 
     const userId = session?.user?.id;
 
     if (!userId) {
-      return throwUnauthorizedGracefully();
+      return { success: false, error: 'User not found' };
     }
 
     await db
@@ -42,18 +41,8 @@ export async function deleteConnection(connectionId: string) {
 
 export async function putConnection(connectionId: string) {
   try {
-    const headersList = await headers();
-    const session = await auth.api.getSession({ headers: headersList });
-
-    if (!session) {
-      return throwUnauthorizedGracefully();
-    }
-
-    const userId = session?.user?.id;
-
-    if (!userId) {
-      return throwUnauthorizedGracefully();
-    }
+    const userId = await getAuthenticatedUserId();
+    if (!userId) return { success: false, error: 'User not found' };
 
     const [foundConnection] = await db
       .select()
@@ -62,7 +51,7 @@ export async function putConnection(connectionId: string) {
       .limit(1);
 
     if (!foundConnection) {
-      throw new Error('Connection not found');
+      return { success: false, error: 'Connection not found' };
     }
 
     await db
@@ -75,6 +64,6 @@ export async function putConnection(connectionId: string) {
     return { success: true };
   } catch (error) {
     console.error('Failed to update connection:', error);
-    throw new Error('Failed to update connection');
+    return { success: false, error: String(error) };
   }
 }

apps/mail/actions/drafts.ts

@@ -1,5 +1,4 @@
 'use server';
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { getActiveDriver } from './utils';
 
 export const getDrafts = async ({
@@ -16,32 +15,21 @@ export const getDrafts = async ({
     return await driver.listDrafts(q, max, pageToken);
   } catch (error) {
     console.error('Error getting threads:', error);
-    await throwUnauthorizedGracefully();
-    // throw error;
-    return { messages: [], nextPageToken: null };
+    throw error;
   }
 };
 
 export const createDraft = async (data: any) => {
   try {
     const driver = await getActiveDriver();
-
-    const res = await driver.createDraft(data);
-
-    return { success: true, id: res.id };
+    return await driver.createDraft(data);
   } catch (error) {
     console.error('Error creating draft:', error);
-    return { success: false, error: String(error) };
+    throw error;
   }
 };
 
 export const getDraft = async (id: string) => {
-  if (!id) {
-    throw new Error('Missing draft ID');
-  }
-
-  console.log('getting email:', id);
-
   try {
     const driver = await getActiveDriver();
     return await driver.getDraft(id);

apps/mail/actions/email-aliases.ts

@@ -1,5 +1,4 @@
 'use server';
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { connection, summary } from '@zero/db/schema';
 import { headers } from 'next/headers';
 import { and, eq } from 'drizzle-orm';
@@ -12,7 +11,7 @@ export const GetSummary = async (threadId: string) => {
   const session = await auth.api.getSession({ headers: headersList });
 
   if (!session || !session.connectionId) {
-    return throwUnauthorizedGracefully();
+    return null;
   }
 
   const [_connection] = await db
@@ -21,7 +20,7 @@ export const GetSummary = async (threadId: string) => {
     .where(and(eq(connection.userId, session.user.id), eq(connection.id, session.connectionId)));
 
   if (!_connection) {
-    return throwUnauthorizedGracefully();
+    return null;
   }
 
   try {

apps/mail/actions/getSummary.ts

@@ -1,53 +1,17 @@
 'use server';
-import { deleteActiveConnection, FatalErrors, getActiveDriver } from './utils';
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { IGetThreadResponse } from '@/app/api/driver/types';
+import { getActiveDriver } from './utils';
 import { ParsedMessage } from '@/types';
 
-export const getMails = async ({
-  folder,
-  q,
-  max,
-  labelIds,
-  pageToken,
-}: {
-  folder: string;
-  q?: string;
-  max?: number;
-  labelIds?: string[];
-  pageToken: string | number | undefined;
-}) => {
-  if (!folder) {
-    throw new Error('Missing required fields');
-  }
-
-  try {
-    const driver = await getActiveDriver();
-    return await driver.list(folder, q, max, labelIds, pageToken);
-  } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
-    console.error('Error getting threads:', error);
-    // throw error;
-    await throwUnauthorizedGracefully();
-    return { messages: [], nextPageToken: null };
-  }
-};
-
-export const getMail = async ({ id }: { id: string }): Promise<IGetThreadResponse> => {
+export const getMail = async ({ id }: { id: string }): Promise<IGetThreadResponse | null> => {
   if (!id) {
     throw new Error('Missing required fields');
   }
   try {
     const driver = await getActiveDriver();
     const mailData = await driver.get(id);
-
-    if (!mailData) {
-      throw new Error('Mail data not found');
-    }
-
     return mailData;
   } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
     console.error('Error getting mail:', error);
     throw error;
   }
@@ -59,7 +23,6 @@ export const markAsRead = async ({ ids }: { ids: string[] }) => {
     await driver.markAsRead(ids);
     return { success: true };
   } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
     console.error('Error marking message as read:', error);
     throw error;
   }
@@ -71,23 +34,11 @@ export const markAsUnread = async ({ ids }: { ids: string[] }) => {
     await driver.markAsUnread(ids);
     return { success: true };
   } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
     console.error('Error marking message as unread:', error);
     throw error;
   }
 };
 
-export const mailCount = async () => {
-  try {
-    const driver = await getActiveDriver();
-    return await driver.count();
-  } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
-    console.error('Error getting mail count:', error);
-    throw error;
-  }
-};
-
 export const modifyLabels = async ({
   threadId,
   addLabels = [],
@@ -117,7 +68,6 @@ export const modifyLabels = async ({
     console.log('Server: No label changes specified');
     return { success: false, error: 'No label changes specified' };
   } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
     console.error('Error updating thread labels:', error);
     throw error;
   }
@@ -159,7 +109,6 @@ export const toggleStar = async ({ ids }: { ids: string[] }) => {
 
     return { success: true };
   } catch (error) {
-    if (FatalErrors.includes((error as Error).message)) await deleteActiveConnection();
     console.error('Error toggling star:', error);
     throw error;
   }

apps/mail/actions/mail.ts

@@ -1,6 +1,5 @@
 'use server';
 
-import { throwUnauthorizedGracefully } from '@/app/api/utils';
 import { createDriver } from '@/app/api/driver';
 import { getActiveConnection } from './utils';
 import { Sender } from '@/types';
@@ -33,7 +32,7 @@ export async function sendEmail({
   const connection = await getActiveConnection();
 
   if (!connection?.accessToken || !connection.refreshToken) {
-    return throwUnauthorizedGracefully();
+    return null;
   }
 
   const driver = await createDriver(connection.providerId, {