fix: new imap

activepieces · Feb 21, 2024 · e1e1696 · e1e1696
1 parent 9a7e1d5
commit e1e1696
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/packages/pieces/community/imap/src/index.ts b/packages/pieces/community/imap/src/index.ts
@@ -44,26 +44,27 @@ export const imapAuth = PieceAuth.CustomAuth({
     }),
   },
   validate: async ({ auth }) => {
+    const imapConfig = imapCommon.constructConfig(
+      auth as {
+        host: string;
+        username: string;
+        password: string;
+        port: number;
+        tls: boolean;
+      }
+    );
+    const imapClient = new ImapFlow({ ...imapConfig, logger: false });
     try {
-      const imapConfig = imapCommon.constructConfig(
-        auth as {
-          host: string;
-          username: string;
-          password: string;
-          port: number;
-          tls: boolean;
-        }
-      );
-      const imapClient = new ImapFlow({ ...imapConfig, logger: false });
       await imapClient.connect();
       await imapClient.noop();
-      await imapClient.logout();
       return { valid: true };
     } catch (e) {
       return {
         valid: false,
         error: JSON.stringify(e),
       };
+    } finally {
+      await imapClient.logout();
     }
   },
   required: true,

diff --git a/packages/pieces/community/imap/src/lib/common/index.ts b/packages/pieces/community/imap/src/lib/common/index.ts
@@ -50,8 +50,6 @@ export const imapCommon = {
             value: mailbox.path,
           };
         });
-      } catch (error) {
-        throw error;
       } finally {
         await imapClient.logout();
       }
@@ -88,7 +86,7 @@ export const imapCommon = {
     );
     const imapClient = new ImapFlow({ ...imapConfig, logger: false });
     await imapClient.connect();
-    let lock = await imapClient.getMailboxLock(mailbox);
+    const lock = await imapClient.getMailboxLock(mailbox);
     try {
       const res = imapClient.fetch(
         {