tests: Added e2e testing for auth endpoints and fixed error in api-ci file

Author: OscarS05

.github/workflows/api-ci.yml

@@ -73,12 +73,17 @@ jobs:
       postgres-e2e:
         image: postgres:13
         ports:
-          - 5434:5432
+          - 5432:5432
         env:
           POSTGRES_DB: db_e2e
           POSTGRES_USER: e2e
           POSTGRES_PASSWORD: e2e123
 
+      redis-e2e:
+        image: redis:8
+        ports:
+          - 6380:6379
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -88,7 +93,10 @@ jobs:
         run: npm run e2e:ci
         env:
           PORT: 3000
-          DATABASE_URL: postgres://e2e:e2e123@localhost:5434/db_e2e
+          DATABASE_URL: postgres://e2e:e2e123@postgres-e2e:5432/db_e2e
           JWT_SECRET_VERIFY_EMAIL: verify-email-test
           JWT_ACCESS_SECRET: access-secret-test
           JWT_REFRESH_SECRET: refresh-secret-test
+          REDIS_HOST: redis-e2e
+          REDIS_PORT: 6380
+          REDIS_PASSWORD:

api/src/infrastructure/queues/workers/email.process.js

@@ -0,0 +1,21 @@
+const { config } = require('../../../../config/config');
+const { sendEmail } = require('../../adapters/email/nodemailerAdapter');
+const { sendVerificationEmailName } = require('../../../../utils/constants');
+
+async function processEmailJob(job) {
+  const { email, name, token } = job.data;
+
+  switch (job.name) {
+    case sendVerificationEmailName:
+      return sendEmail({
+        from: config.smtpEmail,
+        to: email,
+        subject: 'Email Verification',
+        html: `<p>Hello ${name},</p><p>Please verify your email by clicking the link below(This link doesn't work, it's just an example.):</p><a href="${config.frontUrl}/auth/verify-email/email-confirmed?token=${token}">Verify Email. Please, Please copy this token and paste it into the authorize section of the swagger documentation. Token: ${token}</a>`,
+      });
+    default:
+      throw new Error(`Unknown job name: ${job.name}`);
+  }
+}
+
+module.exports = { processEmailJob };

api/src/infrastructure/queues/workers/email.worker.js

@@ -3,32 +3,12 @@ const { Worker } = require('bullmq');
 const { config } = require('../../../../config/config');
 const logger = require('../../../../utils/logger/logger');
 const redis = require('../../store/cache/index');
-const { sendEmail } = require('../../adapters/email/nodemailerAdapter');
-const {
-  emailQueueName,
-  sendVerificationEmailName,
-} = require('../../../../utils/constants');
+const { emailQueueName } = require('../../../../utils/constants');
+const { processEmailJob } = require('./email.process');
 
-const emailWorker = new Worker(
-  emailQueueName,
-  async (job) => {
-    const { email, name, token } = job.data;
-
-    switch (job.name) {
-      case sendVerificationEmailName:
-        await sendEmail({
-          from: config.smtpEmail,
-          to: email,
-          subject: 'Email Verification',
-          html: `<p>Hello ${name},</p><p>Please verify your email by clicking the link below(This link doesn't work, it's just an example.):</p><a href="${config.frontUrl}/auth/verify-email/email-confirmed?token=${token}">Verify Email. Please, Please copy this token and paste it into the authorize section of the swagger documentation. Token: ${token}</a>`,
-        });
-        break;
-      default:
-        throw new Error(`Unknown job name: ${job.name}`);
-    }
-  },
-  { connection: redis },
-);
+const emailWorker = new Worker(emailQueueName, processEmailJob, {
+  connection: redis,
+});
 
 const { isProd } = config;
 
@@ -49,3 +29,5 @@ emailWorker.on('failed', (job, err) => {
     console.error(message);
   }
 });
+
+module.exports = { processEmailJob, emailWorker };

api/src/interfaces/controllers/auth.contoller.js

@@ -70,7 +70,7 @@ const verifyEmailToActivateAccount = async (req, res, next) => {
     const tokenInCookies = req.cookies.verifyEmail;
 
     if (!token || !tokenInCookies)
-      throw boom.unauthorized('Tokens not provided');
+      throw boom.unauthorized('Tokens was not provided');
     if (tokenInCookies !== token)
       throw boom.unauthorized('Tokens do not match');
 
@@ -109,7 +109,7 @@ const changePassword = async (req, res, next) => {
   try {
     const { newPassword } = req.body;
     const token = req.cookies.verifyEmail;
-    if (!token) throw boom.unauthorized('Token not provided');
+    if (!token) throw boom.unauthorized('Token was not provided');
 
     const { message } = await authService.changePassword(token, newPassword);
     if (!message)

api/src/interfaces/middlewares/authentication.handler.js

@@ -44,6 +44,7 @@ async function refreshTokens(req, res, next) {
 
   try {
     const decodedAccessToken = authService.validateAccessToken(accessToken);
+
     if (decodedAccessToken) {
       req.user = decodedAccessToken;
       req.tokens = { accessToken };

api/src/interfaces/routes/auth.router.js

@@ -58,7 +58,7 @@ const {
  *       429:
  *         description: Too many login attempts, please try again later.
  */
-router.post('/login', limiter(5, 15 * 60 * 100, LOGIN_LIMITER_MESSAGE), login);
+router.post('/login', limiter(6, 15 * 60 * 100, LOGIN_LIMITER_MESSAGE), login);
 
 /**
  * @swagger
@@ -95,7 +95,7 @@ router.post('/login', limiter(5, 15 * 60 * 100, LOGIN_LIMITER_MESSAGE), login);
  */
 router.post(
   '/send-verification-email',
-  limiter(3, 15 * 60 * 100, EMAIL_LIMITER_MESSAGE),
+  limiter(4, 15 * 60 * 100, EMAIL_LIMITER_MESSAGE),
   sendVerificationEmail,
 );