Fixing email system

modules/codeHandler.js

@@ -1,27 +1,28 @@
 const MailListener = require('mail-listener2');
 
-const mailListener = new MailListener({
-	username: process.env.MAIL_USER,
-	password: process.env.MAIL_PASSWORD,
-	host: process.env.MAIL_HOST,
-	port: process.env.MAIL_PORT,
-	tls: true,
-});
-
-mailListener.on('server:connected', function() {
-	console.log('imapConnected');
-});
-
-mailListener.on('server:disconnected', function() {
-	console.log('imapDisconnected');
-});
-
-mailListener.on('error', function(err) {
-	console.log(err);
-});
-
-function getCodeFromEmail() {
+async function getCodeFromEmail() {
 	return new Promise((resolve) => {
+		const mailListener = new MailListener({
+			username: process.env.MAIL_USER,
+			password: process.env.MAIL_PASSWORD,
+			host: process.env.MAIL_HOST,
+			port: process.env.MAIL_PORT,
+			tls: true,
+		});
+		mailListener.on('server:connected', function() {
+			console.log('imap server connected');
+		});
+
+		mailListener.on('server:disconnected', function() {
+			console.log('imap server disconnected');
+		});
+
+		mailListener.on('error', function(err) {
+			console.log(err);
+		});
+
+		mailListener.start();
+
 		mailListener.on('mail', function(mail, seqno, attributes) {
 			if (!attributes) return;
 			if (mail.subject.trim() == 'Verify your email address') {
@@ -32,6 +33,7 @@ function getCodeFromEmail() {
 					imap.addFlags(attributes.uid, '\\Seen', (err) => {
 						if (err) console.log('Error marking email as seen:', err);
 					});
+					mailListener.stop();
 					resolve(match[1]);
 				}
 			}
@@ -43,6 +45,7 @@ function getCodeFromEmail() {
 					imap.addFlags(attributes.uid, '\\Seen', (err) => {
 						if (err) console.log('Error marking email as seen:', err);
 					});
+					mailListener.stop();
 					resolve(match[1]);
 				}
 			}
@@ -50,17 +53,4 @@ function getCodeFromEmail() {
 	});
 }
 
-
-function connect() {
-	mailListener.start();
-}
-
-function disconnect() {
-	mailListener.stop();
-}
-
-mailListener.on('attachment', function(attachment) {
-	console.log(attachment.path);
-});
-
-module.exports = { getCodeFromEmail, connect, disconnect };
+module.exports = { getCodeFromEmail };