database wf 10

app/api/mail/login/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server';
-import Imap from 'imap';
+import { ImapFlow } from 'imapflow';
 import { cookies } from 'next/headers';
 
 interface StoredCredentials {
@@ -21,24 +21,21 @@ export async function POST(request: Request) {
     }
 
     // Test IMAP connection
-    const imap = new Imap({
+    const client = new ImapFlow({
-      user: email,
-      password,
       host,
       port: parseInt(port),
-      tls: true,
+      secure: true,
-      tlsOptions: { 
+      auth: {
-        rejectUnauthorized: false,
+        user: email,
-        servername: host
+        pass: password,
       },
-      authTimeout: 10000,
+      logger: false,
-      connTimeout: 10000,
+      emitLogs: false
-      debug: console.log
     });
 
-    return new Promise((resolve, reject) => {
+    try {
-      imap.once('ready', () => {
+      await client.connect();
-        imap.end();
+      await client.mailboxOpen('INBOX');
       
       // Store credentials in cookie
       const cookieStore = cookies();
@@ -58,36 +55,35 @@ export async function POST(request: Request) {
         maxAge: 30 * 24 * 60 * 60 // 30 days
       });
 
-        resolve(NextResponse.json({ success: true }));
+      return NextResponse.json({ success: true });
-      });
-
-      imap.once('error', (err: Error) => {
-        imap.end();
-        if (err.message.includes('Invalid login or password')) {
-          reject(new Error('Invalid login or password'));
-        } else {
-          reject(new Error(`IMAP connection error: ${err.message}`));
-        }
-      });
-
-      imap.connect();
-    });
     } catch (error) {
-    console.error('Error in login handler:', error);
       if (error instanceof Error) {
-      if (error.message.includes('Invalid login or password')) {
+        if (error.message.includes('Invalid login')) {
           return NextResponse.json(
-          { error: 'Invalid login or password', details: error.message },
+            { error: 'Invalid login or password' },
             { status: 401 }
           );
         }
         return NextResponse.json(
-        { error: 'Failed to connect to email server', details: error.message },
+          { error: `IMAP connection error: ${error.message}` },
           { status: 500 }
         );
       }
       return NextResponse.json(
-      { error: 'Unknown error occurred' },
+        { error: 'Failed to connect to email server' },
+        { status: 500 }
+      );
+    } finally {
+      try {
+        await client.logout();
+      } catch (e) {
+        console.error('Error during logout:', e);
+      }
+    }
+  } catch (error) {
+    console.error('Error in login handler:', error);
+    return NextResponse.json(
+      { error: 'An unexpected error occurred' },
       { status: 500 }
     );
   }

app/api/mail/route.ts

@@ -9,14 +9,16 @@ export async function GET() {
 
     if (!credentials) {
       return NextResponse.json(
-        { error: 'No credentials found' },
+        { error: 'No credentials found. Please login to your email account first.' },
         { status: 401 }
       );
     }
 
+    let client;
+    try {
       const { email, password, host, port } = JSON.parse(credentials.value);
 
-    const client = new ImapFlow({
+      client = new ImapFlow({
         host,
         port: parseInt(port),
         secure: true,
@@ -24,6 +26,8 @@ export async function GET() {
           user: email,
           pass: password,
         },
+        logger: false,
+        emitLogs: false
       });
 
       await client.connect();
@@ -40,13 +44,39 @@ export async function GET() {
         });
       }
 
-    await client.logout();
       return NextResponse.json(result);
     } catch (error) {
       console.error('Mail API error:', error);
+      if (error instanceof Error) {
+        if (error.message.includes('Invalid login')) {
+          return NextResponse.json(
+            { error: 'Invalid email credentials. Please login again.' },
+            { status: 401 }
+          );
+        }
+        return NextResponse.json(
+          { error: `Failed to fetch emails: ${error.message}` },
+          { status: 500 }
+        );
+      }
       return NextResponse.json(
         { error: 'Failed to fetch emails' },
         { status: 500 }
       );
+    } finally {
+      if (client) {
+        try {
+          await client.logout();
+        } catch (e) {
+          console.error('Error during logout:', e);
+        }
+      }
+    }
+  } catch (error) {
+    console.error('Unexpected error:', error);
+    return NextResponse.json(
+      { error: 'An unexpected error occurred' },
+      { status: 500 }
+    );
   }
 }