chore: update dependencies and rebase

.eslintrc.js

@@ -4,11 +4,7 @@ module.exports = {
     node: true,
     jest: true,
   },
-<<<<<<< HEAD
   ignorePatterns: ['**/functions/*.js', '**/*.d.ts'],
-=======
-  ignorePatterns: ['**/functions/*.js', '**/node_modules/'],
->>>>>>> 73fd51d (chore: set up jest frontend environment (#759))
   // Prettier plugin should be the last to always override preceding plugins
   extends: ['next', 'airbnb', 'plugin:cypress/recommended', 'prettier'],
   parserOptions: {

__tests__/__mocks__/documentData.js

@@ -11,10 +11,6 @@ const developerData = {
   password: 'password',
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 404d4a7 (chore: create logout developer endpoint; add test #751 (#752))
 // Generate a unique name using a UUID without hyphens
 const generateUniqueName = () => uuid().replace(/-/g, '');
 
@@ -50,32 +46,13 @@ const anotherDeveloperData = {
   name: generateUniqueName(),
   email: generateUniqueEmail(),
   password: generateUniquePassword(),
-<<<<<<< HEAD
-=======
-const newDeveloperData = {
-<<<<<<< HEAD
-  name: 'New Developer',
-  email: 'newdeveloper@example.com',
-  password: 'password',
->>>>>>> 03f15e6 (Fix create login endpoint (#748))
-=======
-  name: `${uuid().replace(/-/g, '')}`,
-  email: `${uuid().replace(/-/g, '')}@testing.com`,
-  password: `${uuid()}`,
->>>>>>> 2b187a9 (Define the login business logic (#750))
-=======
->>>>>>> 404d4a7 (chore: create logout developer endpoint; add test #751 (#752))
 };
 
 const malformedDeveloperData = {
   email: 'developer@example.com',
   password: 'password',
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 404d4a7 (chore: create logout developer endpoint; add test #751 (#752))
 export {
   wordId,
   exampleId,
@@ -86,9 +63,3 @@ export {
   anotherDeveloperData,
   malformedDeveloperData,
 };
-<<<<<<< HEAD
-=======
-export { wordId, exampleId, developerData, newDeveloperData, malformedDeveloperData };
->>>>>>> 03f15e6 (Fix create login endpoint (#748))
-=======
->>>>>>> 404d4a7 (chore: create logout developer endpoint; add test #751 (#752))

__tests__/shared/commands.js

@@ -60,6 +60,26 @@ export const getExamplesV2 = (query = {}, options = {}) =>
     .query(query)
     .set('X-API-Key', options.apiKey || FALLBACK_API_KEY);
 
+    /* Searches for Nsibidi characters using the data in MongoDB V1 */
+export const getNsibidiCharacter = (id, query = {}, options = {}) =>
+server
+  .get(`${API_ROUTE}/nsibidi/${id}`)
+  .query(query)
+  .set('X-API-Key', options.apiKey || FALLBACK_API_KEY);
+
+/* Searches for Nsibidi characters using the data in MongoDB V2 */
+export const getNsibidiCharacterV2 = (id, query = {}, options = {}) =>
+server
+  .get(`${API_ROUTE_V2}/nsibidi/${id}`)
+  .query(query)
+  .set('X-API-Key', options.apiKey || FALLBACK_API_KEY);
+
+export const getNsibidiCharactersV2 = (query = {}, options = {}) =>
+server
+  .get(`${API_ROUTE_V2}/nsibidi`)
+  .query(query)
+  .set('X-API-Key', options.apiKey || FALLBACK_API_KEY);
+
 /* Hits the POST /populate route to seed the local MongoDB database */
 export const populateAPI = () => server.post(`${TEST_ROUTE}/populate`);
 

jest.backend.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   displayName: 'igbo_api',
   testMatch: ['**/__tests__/*.js', '**/__tests__/*.ts'],
-  testTimeout: 20000,
+  testTimeout: 50000,
   testEnvironment: 'node',
   moduleFileExtensions: ['ts', 'js', 'json'],
   globalSetup: './testSetup.js',

package.json

@@ -164,16 +164,8 @@
     "@types/bcrypt": "^5.0.0",
     "@types/compression": "^1.7.2",
     "@types/express-rate-limit": "^6.0.0",
-<<<<<<< HEAD
     "@types/jest": "^29.5.6",
-<<<<<<< HEAD
     "@types/jsonwebtoken": "^9.0.2",
-=======
-=======
-    "@types/jest": "^29.5.4",
-    "@types/jsonwebtoken": "^9.0.2",
->>>>>>> 7a3f647 (Define the login business logic (#750))
->>>>>>> 2b187a9 (Define the login business logic (#750))
     "@types/morgan": "^1.9.4",
     "@types/node": "^20.3.0",
     "@types/react": "^18.2.11",

src/controllers/auth.ts

@@ -1,7 +1,7 @@
 import { Response } from 'express';
 import jwt from 'jsonwebtoken';
 import bcrypt from 'bcrypt';
-import { Developer as DeveloperType, Express } from '../types';
+import { Developer as DeveloperType, MiddleWare } from '../types';
 import { isProduction, isTest } from '../config';
 import { createDbConnection, handleCloseConnection } from '../services/database';
 import { developerSchema } from '../models/Developer';
@@ -37,7 +37,7 @@ const signToken = (email: string) => {
  * Creates and sends a JSON Web Token (JWT) to the client in a response.
  *
  * @param {DeveloperType} developer - The developer data to include in the JWT payload.
- * @param {Express.Response} res - The Express response object to send the token in.
+ * @param {Response} res - The Express response object to send the token in.
  * @returns {string} The signed JWT token.
  * @throws {Error} If an error occurs during the token signing or sending process.
  */
@@ -76,13 +76,13 @@ const loginDeveloperWithEmailAndPassword = async (email: string, password: strin
 /**
  * Handles the login process for a developer.
  *
- * @param {Express.IgboAPIRequest} req - The Express request object.
- * @param {Express.Response} res - The Express response object.
- * @param {Express.NextFunction} next - The next middleware function.
+ * @param {IgboAPIRequest} req - The Express request object.
+ * @param {Response} res - The Express response object.
+ * @param {NextFunction} next - The next middleware function.
  * @returns {Promise<void>} A Promise that resolves when the login process is complete.
  * @throws {Error} If an error occurs during the login process.
  */
-export const login: Express.MiddleWare = async (req, res, next) => {
+export const login: MiddleWare = async (req, res, next) => {
   try {
     const { email, password } = req.body;
 
@@ -104,12 +104,12 @@ export const login: Express.MiddleWare = async (req, res, next) => {
 
 /**
  * Handles the logout process for a developer.
- * @param {Express.IgboAPIRequest} req - The Express request object.
- * @param {Express.Response} res - The Express response object.
- * @param {Express.NextFunction} next - The next middleware function.
+ * @param {IgboAPIRequest} req - The Express request object.
+ * @param {Response} res - The Express response object.
+ * @param {NextFunction} next - The next middleware function.
  * @returns {Promise<void>} A Promise that resolves when the logout process is complete.
  */
-export const logout: Express.MiddleWare = async (req, res, next) => {
+export const logout: MiddleWare = async (req, res, next) => {
   try {
     res.cookie('jwt', '', { expires: new Date(), httpOnly: true });
 

src/controllers/utils/findDeveloper.ts

@@ -1,9 +1,9 @@
 import { compareSync } from 'bcrypt';
 import { developerSchema } from '../../models/Developer';
 import { createDbConnection } from '../../services/database';
-import { DeveloperDocument, Express } from '../../types';
+import { DeveloperDocument, MiddleWare } from '../../types';
 
-export const handleRequest: Express.MiddleWare = (req) => {
+export const handleRequest: MiddleWare = (req) => {
   const { apiLimit } = req.query;
   const apiToken = req.headers['X-API-Key'] || req.headers['x-api-key'];
 

src/middleware/authenticate.ts

@@ -1,6 +1,6 @@
 import jwt from 'jsonwebtoken';
 import { JWT_SECRET } from '../siteConstants';
-import { Express } from '../types';
+import { MiddleWare } from '../types';
 import { createDbConnection, handleCloseConnection } from '../services/database';
 import { developerSchema } from '../models/Developer';
 
@@ -10,7 +10,7 @@ interface DeveloperDataType {
   exp?: number;
 }
 
-export const authenticate: Express.MiddleWare = async (req, res, next) => {
+export const authenticate: MiddleWare = async (req, res, next) => {
   let token: string | undefined;
   // Check if token is set
   if (req.headers.authorization && req.headers.authorization.startsWith('Bearer')) {