From ca58e9e24732e15c82d5ba2fb45938074f88583e Mon Sep 17 00:00:00 2001 From: Rahul Harihar Date: Sun, 28 Sep 2025 23:31:38 +0545 Subject: [PATCH 1/6] feat(models): add Budget schema for category-based monthly limits --- backend/models/Budget.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 backend/models/Budget.js diff --git a/backend/models/Budget.js b/backend/models/Budget.js new file mode 100644 index 0000000..8ea190e --- /dev/null +++ b/backend/models/Budget.js @@ -0,0 +1,30 @@ +const mongoose = require("mongoose"); + +const budgetSchema = new mongoose.Schema( + { + user: { + type: mongoose.Schema.Types.ObjectId, + ref: "User", + required: true, + }, + category: { + type: String, + required: true, + }, + amount: { + type: Number, + required: true, + }, + month: { + type: Number, + required: true, + }, + year: { + type: Number, + required: true, + }, + }, + { timestamps: true } +); + +module.exports = mongoose.model("Budget", budgetSchema); From 4152ff6af8e7879b0b8e33cca476e3b8ab9bb586 Mon Sep 17 00:00:00 2001 From: Rahul Harihar Date: Wed, 1 Oct 2025 19:26:42 +0545 Subject: [PATCH 2/6] Cleanup: removed formatting noise and applied requested fixes --- backend/__tests__/auth.test.js | 108 +++++++++++++++------ backend/config/db.js | 16 +-- backend/middleware/validationMiddleware.js | 88 +++++++++-------- backend/package-lock.json | 20 +++- backend/package.json | 3 +- backend/server.js | 36 ++++--- frontend/.env | 2 + package-lock.json | 6 ++ package.json | 1 + 9 files changed, 191 insertions(+), 89 deletions(-) create mode 100644 frontend/.env create mode 100644 package-lock.json create mode 100644 package.json diff --git a/backend/__tests__/auth.test.js b/backend/__tests__/auth.test.js index b97d586..cbca92f 100644 --- a/backend/__tests__/auth.test.js +++ b/backend/__tests__/auth.test.js @@ -1,3 +1,4 @@ +process.env.NODE_ENV = 'test'; const request = require('supertest'); const mongoose = require('mongoose'); const { MongoMemoryServer } = require('mongodb-memory-server'); @@ -7,38 +8,91 @@ const User = require('../models/User'); let mongoServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); - const mongoUri = mongoServer.getUri(); - process.env.MONGO_URI = mongoUri; + mongoServer = await MongoMemoryServer.create(); + const mongoUri = mongoServer.getUri(); + process.env.MONGO_URI = mongoUri; + await mongoose.connect(mongoUri, { + useNewUrlParser: true, + useUnifiedTopology: true, + }); }); afterAll(async () => { - await mongoose.disconnect(); - await mongoServer.stop(); - server.close(); + await mongoose.disconnect(); + await mongoServer.stop(); + server.close(); }); describe('Auth API', () => { - - beforeEach(async () => { - await User.deleteMany({}); - }); - - it('should allow a new user to sign up', async () => { - const newUser = { - email: 'testuser@gmail.com', - password: 'Password123!', - }; - - const response = await request(app) - .post('/api/auth/signup') - .send(newUser); - - expect(response.statusCode).toBe(201); - expect(response.body).toHaveProperty('token'); - - const savedUser = await User.findOne({ email: 'testuser@gmail.com' }); - expect(savedUser).not.toBeNull(); - }); + beforeEach(async () => { + await User.deleteMany({}); + }); + it('should allow a new user to sign up', async () => { + const newUser = { + email: 'testuser@gmail.com', + password: 'Password123!', + }; + + const response = await request(app).post('/api/auth/signup').send(newUser); + + expect(response.statusCode).toBe(201); + expect(response.body).toHaveProperty('token'); + + const savedUser = await User.findOne({ email: 'testuser@gmail.com' }); + expect(savedUser).not.toBeNull(); + }); + + it('should reject signup with an existing email', async () => { + const testUser = { + email: 'duplicate@gmail.com', + password: 'Password123!', + }; + + await request(app).post('/api/auth/signup').send(testUser).expect(201); + + const response = await request(app) + .post('/api/auth/signup') + .send(testUser) + .expect(400); + + expect(response.body.message).toBe('User already exists'); + + const users = await User.find({ email: testUser.email }); + expect(users.length).toBe(1); + }); + + it('should reject signup when email is missing', async () => { + const missingEmailUser = { + email: "", + password: 'Password123!', + }; + + const response = await request(app) + .post('/api/auth/signup') + .send(missingEmailUser) + .expect(400); + + expect(response.body.message).toBe('Please enter all fields'); + + const users = await User.find({}); + expect(users.length).toBe(0); + }); + + it('should reject signup when password is missing', async () => { + const missingPasswordUser = { + email: 'user@example.com', + password: "", + }; + + const response = await request(app) + .post('/api/auth/signup') + .send(missingPasswordUser) + .expect(400); + + expect(response.body.message).toBe('Please enter all fields'); + + const users = await User.find({}); + expect(users.length).toBe(0); + }); }); \ No newline at end of file diff --git a/backend/config/db.js b/backend/config/db.js index 7cdfefa..d855fef 100644 --- a/backend/config/db.js +++ b/backend/config/db.js @@ -1,13 +1,15 @@ const mongoose = require('mongoose'); const connectDB = async () => { - try { - const conn = await mongoose.connect(process.env.MONGO_URI); - console.log(`MongoDB Connected: ${conn.connection.host}`); - } catch (error) { - console.error(`Error: ${error.message}`); - process.exit(1); - } + try { + const conn = await mongoose.connect(process.env.MONGO_URI); + console.log(`MongoDB Connected: ${conn.connection.host}`); + } catch (error) { + console.error(`Error: ${error.message}`); + if (process.env.NODE_ENV !== "test") { + process.exit(1); + } + } }; module.exports = connectDB; \ No newline at end of file diff --git a/backend/middleware/validationMiddleware.js b/backend/middleware/validationMiddleware.js index 9a1caab..0e5c050 100644 --- a/backend/middleware/validationMiddleware.js +++ b/backend/middleware/validationMiddleware.js @@ -2,49 +2,61 @@ const { body, validationResult } = require('express-validator'); const dns = require('dns'); const validateRegistration = [ - // Validate email - body('email') - .isEmail() - .withMessage('Please enter a valid email address.') - .bail() // Stop running validators if the previous one failed - .custom(async (email) => { - const domain = email.split('@')[1]; + (req, res, next) => { + if (!req.body.email || !req.body.password) { + return res.status(400).json({ message: "Please enter all fields" }); + } + next(); + }, + // Validate email + body('email') + .isEmail() + .withMessage('Please enter a valid email address.') + .bail() // Stop running validators if the previous one failed + .custom(async (email) => { + const domain = email.split("@")[1]; - // Quick blacklist for common invalid domains - const blockedDomains = ['example.com', 'test.com', 'invalid.com']; - if (blockedDomains.includes(domain)) { - return Promise.reject('This email domain is not allowed.'); - } + // Quick blacklist for common invalid domains + const blockedDomains = ['example.com', 'test.com', 'invalid.com']; + if (blockedDomains.includes(domain)) { + return Promise.reject('This email domain is not allowed.'); + } - // Check for valid MX records - try { - const addresses = await dns.promises.resolveMx(domain); - if (!addresses || addresses.length === 0) { - return Promise.reject('Email domain does not exist or cannot receive mail.'); - } - } catch (error) { - // If DNS resolution fails - return Promise.reject('Email domain does not exist or cannot receive mail.'); - } - }), + // Check for valid MX records + try { + const addresses = await dns.promises.resolveMx(domain); + if (!addresses || addresses.length === 0) { + return Promise.reject( + 'Email domain does not exist or cannot receive mail.' + ); + } + } catch (error) { + // If DNS resolution fails + return Promise.reject( + 'Email domain does not exist or cannot receive mail.' + ); + } + }), - // Validate password - body('password') - .isLength({ min: 8, max: 16 }) - .withMessage('Password must be between 8 and 16 characters long.') - .matches(/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[\W_])/) - .withMessage('Password must contain at least one alphabet, one digit, and one symbol.'), + // Validate password + body('password') + .isLength({ min: 8, max: 16 }) + .withMessage('Password must be between 8 and 16 characters long.') + .matches(/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[\W_])/) + .withMessage( + 'Password must contain at least one alphabet, one digit, and one symbol.' + ), - // Middleware to handle the validation result - (req, res, next) => { - const errors = validationResult(req); - if (!errors.isEmpty()) { - return res.status(400).json({ message: errors.array()[0].msg }); - } - next(); - }, + // Middleware to handle the validation result + (req, res, next) => { + const errors = validationResult(req); + if (!errors.isEmpty()) { + return res.status(400).json({ message: errors.array()[0].msg }); + } + next(); + }, ]; module.exports = { - validateRegistration, + validateRegistration, }; \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json index 1aaab6b..b66c79e 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -18,7 +18,8 @@ "jsonwebtoken": "^9.0.2", "mongodb": "^6.19.0", "mongoose": "^8.18.1", - "multer": "^2.0.2" + "multer": "^2.0.2", + "resend": "^6.1.0" }, "devDependencies": { "jest": "^29.7.0", @@ -4836,6 +4837,23 @@ "node": ">=0.10.0" } }, + "node_modules/resend": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/resend/-/resend-6.1.0.tgz", + "integrity": "sha512-H0cJI2pcLk5/dGwyvZUHu+O7X/q6arvc40EWm+pRPuy+PSWojH5utZtmDBUZ2L0+gVwYZiWs6y2lw6GQA1z1rg==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@react-email/render": "^1.1.0" + }, + "peerDependenciesMeta": { + "@react-email/render": { + "optional": true + } + } + }, "node_modules/resolve": { "version": "1.22.10", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", diff --git a/backend/package.json b/backend/package.json index 7f2ccb4..92c9389 100644 --- a/backend/package.json +++ b/backend/package.json @@ -23,7 +23,8 @@ "jsonwebtoken": "^9.0.2", "mongodb": "^6.19.0", "mongoose": "^8.18.1", - "multer": "^2.0.2" + "multer": "^2.0.2", + "resend": "^6.1.0" }, "devDependencies": { "jest": "^29.7.0", diff --git a/backend/server.js b/backend/server.js index afa9fc0..c2b508d 100644 --- a/backend/server.js +++ b/backend/server.js @@ -8,25 +8,29 @@ const connectDB = require('./config/db'); dotenv.config(); // Connect to database -connectDB(); +if (process.env.NODE_ENV !== 'test') { + connectDB(); +} const app = express(); const allowedOrigins = [ - "http://localhost:5173", - "https://paisable.netlify.app" + 'http://localhost:5173', + 'https://paisable.netlify.app', ]; -app.use(cors({ - origin: function (origin, callback) { - if (!origin || allowedOrigins.includes(origin)) { - callback(null, true); - } else { - callback(new Error("Not allowed by CORS")); - } - }, - credentials: true -})); +app.use( + cors({ + origin: function (origin, callback) { + if (!origin || allowedOrigins.includes(origin)) { + callback(null, true); + } else { + callback(new Error('Not allowed by CORS')); + } + }, + credentials: true, + }) +); app.use(express.json()); // Routes @@ -38,11 +42,13 @@ app.use('/api/receipts', require('./routes/receiptRoutes')); app.use('/uploads', express.static(path.join(__dirname, 'uploads'))); app.get('/', (req, res) => { - res.send('API is Running'); + res.send('API is Running'); }); const PORT = process.env.PORT || 5000; -const server = app.listen(PORT, () => console.log(`Server started on port ${PORT}`)); +const server = app.listen(PORT, () => + console.log(`Server started on port ${PORT}`) +); module.exports = { app, server }; \ No newline at end of file diff --git a/frontend/.env b/frontend/.env new file mode 100644 index 0000000..345e230 --- /dev/null +++ b/frontend/.env @@ -0,0 +1,2 @@ +VITE_API_URL=http://localhost:5000/api + diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..cd43f86 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "paisable", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/package.json @@ -0,0 +1 @@ +{} From d908899329184c1357919bc1c896e89bc3e026c8 Mon Sep 17 00:00:00 2001 From: Rahul Harihar Date: Wed, 1 Oct 2025 19:40:10 +0545 Subject: [PATCH 3/6] Remove unwanted file from PR --- backend/models/Budget.js | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 backend/models/Budget.js diff --git a/backend/models/Budget.js b/backend/models/Budget.js deleted file mode 100644 index 8ea190e..0000000 --- a/backend/models/Budget.js +++ /dev/null @@ -1,30 +0,0 @@ -const mongoose = require("mongoose"); - -const budgetSchema = new mongoose.Schema( - { - user: { - type: mongoose.Schema.Types.ObjectId, - ref: "User", - required: true, - }, - category: { - type: String, - required: true, - }, - amount: { - type: Number, - required: true, - }, - month: { - type: Number, - required: true, - }, - year: { - type: Number, - required: true, - }, - }, - { timestamps: true } -); - -module.exports = mongoose.model("Budget", budgetSchema); From 1cfe3369e85c066cf7442bbbb14f24048143fdc5 Mon Sep 17 00:00:00 2001 From: Rahul Harihar Date: Wed, 1 Oct 2025 19:52:41 +0545 Subject: [PATCH 4/6] Remove resend from package-lock.json after uninstall --- backend/package-lock.json | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index b66c79e..1f2fdb7 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -18,8 +18,7 @@ "jsonwebtoken": "^9.0.2", "mongodb": "^6.19.0", "mongoose": "^8.18.1", - "multer": "^2.0.2", - "resend": "^6.1.0" + "multer": "^2.0.2" }, "devDependencies": { "jest": "^29.7.0", @@ -2536,21 +2535,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -4837,23 +4821,6 @@ "node": ">=0.10.0" } }, - "node_modules/resend": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/resend/-/resend-6.1.0.tgz", - "integrity": "sha512-H0cJI2pcLk5/dGwyvZUHu+O7X/q6arvc40EWm+pRPuy+PSWojH5utZtmDBUZ2L0+gVwYZiWs6y2lw6GQA1z1rg==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@react-email/render": "^1.1.0" - }, - "peerDependenciesMeta": { - "@react-email/render": { - "optional": true - } - } - }, "node_modules/resolve": { "version": "1.22.10", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", From 70c99800395f95e9ac34ea16e12e6ee3a0697004 Mon Sep 17 00:00:00 2001 From: Rahul Harihar Date: Sat, 11 Oct 2025 19:35:40 +0545 Subject: [PATCH 5/6] fix: cleaned up duplicate test, adjusted server connection logic, and removed unwanted files --- backend/package.json | 4 +--- backend/server.js | 7 +++---- frontend/.env | 2 -- package-lock.json | 6 ------ package.json | 1 - 5 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 frontend/.env delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/backend/package.json b/backend/package.json index 23ed8a0..5146d4d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -24,9 +24,7 @@ "jsonwebtoken": "^9.0.2", "mongodb": "^6.19.0", "mongoose": "^8.18.1", - "multer": "^2.0.2", - "node-cron": "^4.2.1", - "papaparse": "^5.5.3" + "multer": "^2.0.2" }, "devDependencies": { "jest": "^29.7.0", diff --git a/backend/server.js b/backend/server.js index 3dde239..1785ae7 100644 --- a/backend/server.js +++ b/backend/server.js @@ -11,9 +11,7 @@ require('./cron'); dotenv.config(); // Connect to database -if (process.env.NODE_ENV !== 'test') { - connectDB(); -} +connectDB(); const app = express(); @@ -74,4 +72,5 @@ cron.schedule("*/10 * * * *", async () => { } }); -module.exports = { app, server }; \ No newline at end of file +module.exports = { app, server }; +module.exports = { app, server }; diff --git a/frontend/.env b/frontend/.env deleted file mode 100644 index 345e230..0000000 --- a/frontend/.env +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL=http://localhost:5000/api - diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index cd43f86..0000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "paisable", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} diff --git a/package.json b/package.json deleted file mode 100644 index 0967ef4..0000000 --- a/package.json +++ /dev/null @@ -1 +0,0 @@ -{} From 563e56cadc644b364d367464fca3c68f9bec64d8 Mon Sep 17 00:00:00 2001 From: Avdhesh-Varshney Date: Fri, 31 Oct 2025 23:27:56 +0530 Subject: [PATCH 6/6] fix & formatting --- backend/__tests__/auth.test.js | 128 ++++++++++----------- backend/config/db.js | 20 ++-- backend/middleware/validationMiddleware.js | 100 ++++++++-------- backend/server.js | 27 +++-- 4 files changed, 135 insertions(+), 140 deletions(-) diff --git a/backend/__tests__/auth.test.js b/backend/__tests__/auth.test.js index 4da3936..32a7d2a 100644 --- a/backend/__tests__/auth.test.js +++ b/backend/__tests__/auth.test.js @@ -8,26 +8,22 @@ const User = require('../models/User'); let mongoServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); - const mongoUri = mongoServer.getUri(); - process.env.MONGO_URI = mongoUri; - await mongoose.connect(mongoUri, { - useNewUrlParser: true, - useUnifiedTopology: true, - }); + mongoServer = await MongoMemoryServer.create(); + const mongoUri = mongoServer.getUri(); + process.env.MONGO_URI = mongoUri; + await mongoose.connect(mongoUri, { + useNewUrlParser: true, + useUnifiedTopology: true, + }); }); afterAll(async () => { - await mongoose.disconnect(); - await mongoServer.stop(); - server.close(); + await mongoose.disconnect(); + await mongoServer.stop(); + server.close(); }); describe('Auth API', () => { - beforeEach(async () => { - await User.deleteMany({}); - }); - beforeEach(async () => { await User.deleteMany({}); }); @@ -44,7 +40,7 @@ describe('Auth API', () => { expect(response.statusCode).toBe(201); expect(response.body).toHaveProperty('token'); - + const savedUser = await User.findOne({ email: 'testuser@gmail.com' }); expect(savedUser).not.toBeNull(); expect(savedUser.defaultCurrency).toBe('USD'); @@ -109,71 +105,71 @@ describe('Auth API', () => { expect(setupResponse.body.message).toBe('Default currency is required'); }); - it('should allow a new user to sign up', async () => { - const newUser = { - email: 'testuser@gmail.com', - password: 'Password123!', - }; + it('should allow a new user to sign up', async () => { + const newUser = { + email: 'testuser@gmail.com', + password: 'Password123!', + }; - const response = await request(app).post('/api/auth/signup').send(newUser); + const response = await request(app).post('/api/auth/signup').send(newUser); - expect(response.statusCode).toBe(201); - expect(response.body).toHaveProperty('token'); + expect(response.statusCode).toBe(201); + expect(response.body).toHaveProperty('token'); - const savedUser = await User.findOne({ email: 'testuser@gmail.com' }); - expect(savedUser).not.toBeNull(); - }); + const savedUser = await User.findOne({ email: 'testuser@gmail.com' }); + expect(savedUser).not.toBeNull(); + }); - it('should reject signup with an existing email', async () => { - const testUser = { - email: 'duplicate@gmail.com', - password: 'Password123!', - }; + it('should reject signup with an existing email', async () => { + const testUser = { + email: 'duplicate@gmail.com', + password: 'Password123!', + }; - await request(app).post('/api/auth/signup').send(testUser).expect(201); + await request(app).post('/api/auth/signup').send(testUser).expect(201); - const response = await request(app) - .post('/api/auth/signup') - .send(testUser) - .expect(400); + const response = await request(app) + .post('/api/auth/signup') + .send(testUser) + .expect(400); - expect(response.body.message).toBe('User already exists'); + expect(response.body.message).toBe('User already exists'); - const users = await User.find({ email: testUser.email }); - expect(users.length).toBe(1); - }); + const users = await User.find({ email: testUser.email }); + expect(users.length).toBe(1); + }); - it('should reject signup when email is missing', async () => { - const missingEmailUser = { - email: "", - password: 'Password123!', - }; + it('should reject signup when email is missing', async () => { + const missingEmailUser = { + email: "", + password: 'Password123!', + }; - const response = await request(app) - .post('/api/auth/signup') - .send(missingEmailUser) - .expect(400); + const response = await request(app) + .post('/api/auth/signup') + .send(missingEmailUser) + .expect(400); - expect(response.body.message).toBe('Please enter all fields'); + expect(response.body.message).toBe('Please enter all fields'); - const users = await User.find({}); - expect(users.length).toBe(0); - }); + const users = await User.find({}); + expect(users.length).toBe(0); + }); - it('should reject signup when password is missing', async () => { - const missingPasswordUser = { - email: 'user@example.com', - password: "", - }; + it('should reject signup when password is missing', async () => { + const missingPasswordUser = { + email: 'user@example.com', + password: "", + }; - const response = await request(app) - .post('/api/auth/signup') - .send(missingPasswordUser) - .expect(400); + const response = await request(app) + .post('/api/auth/signup') + .send(missingPasswordUser) + .expect(400); - expect(response.body.message).toBe('Please enter all fields'); + expect(response.body.message).toBe('Please enter all fields'); - const users = await User.find({}); - expect(users.length).toBe(0); - }); + const users = await User.find({}); + expect(users.length).toBe(0); + }); }); \ No newline at end of file diff --git a/backend/config/db.js b/backend/config/db.js index d855fef..c274c60 100644 --- a/backend/config/db.js +++ b/backend/config/db.js @@ -1,15 +1,15 @@ const mongoose = require('mongoose'); const connectDB = async () => { - try { - const conn = await mongoose.connect(process.env.MONGO_URI); - console.log(`MongoDB Connected: ${conn.connection.host}`); - } catch (error) { - console.error(`Error: ${error.message}`); - if (process.env.NODE_ENV !== "test") { - process.exit(1); - } - } + try { + const conn = await mongoose.connect(process.env.MONGO_URI); + console.log(`MongoDB Connected: ${conn.connection.host}`); + } catch (error) { + console.error(`Error: ${error.message}`); + if (process.env.NODE_ENV !== "test") { + process.exit(1); + } + } }; -module.exports = connectDB; \ No newline at end of file +module.exports = connectDB; diff --git a/backend/middleware/validationMiddleware.js b/backend/middleware/validationMiddleware.js index 0e5c050..fc11eec 100644 --- a/backend/middleware/validationMiddleware.js +++ b/backend/middleware/validationMiddleware.js @@ -2,61 +2,61 @@ const { body, validationResult } = require('express-validator'); const dns = require('dns'); const validateRegistration = [ - (req, res, next) => { - if (!req.body.email || !req.body.password) { - return res.status(400).json({ message: "Please enter all fields" }); - } - next(); - }, - // Validate email - body('email') - .isEmail() - .withMessage('Please enter a valid email address.') - .bail() // Stop running validators if the previous one failed - .custom(async (email) => { - const domain = email.split("@")[1]; + (req, res, next) => { + if (!req.body.email || !req.body.password) { + return res.status(400).json({ message: "Please enter all fields" }); + } + next(); + }, + // Validate email + body('email') + .isEmail() + .withMessage('Please enter a valid email address.') + .bail() // Stop running validators if the previous one failed + .custom(async (email) => { + const domain = email.split("@")[1]; - // Quick blacklist for common invalid domains - const blockedDomains = ['example.com', 'test.com', 'invalid.com']; - if (blockedDomains.includes(domain)) { - return Promise.reject('This email domain is not allowed.'); - } + // Quick blacklist for common invalid domains + const blockedDomains = ['example.com', 'test.com', 'invalid.com']; + if (blockedDomains.includes(domain)) { + return Promise.reject('This email domain is not allowed.'); + } - // Check for valid MX records - try { - const addresses = await dns.promises.resolveMx(domain); - if (!addresses || addresses.length === 0) { - return Promise.reject( - 'Email domain does not exist or cannot receive mail.' - ); - } - } catch (error) { - // If DNS resolution fails - return Promise.reject( - 'Email domain does not exist or cannot receive mail.' - ); - } - }), + // Check for valid MX records + try { + const addresses = await dns.promises.resolveMx(domain); + if (!addresses || addresses.length === 0) { + return Promise.reject( + 'Email domain does not exist or cannot receive mail.' + ); + } + } catch (error) { + // If DNS resolution fails + return Promise.reject( + 'Email domain does not exist or cannot receive mail.' + ); + } + }), - // Validate password - body('password') - .isLength({ min: 8, max: 16 }) - .withMessage('Password must be between 8 and 16 characters long.') - .matches(/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[\W_])/) - .withMessage( - 'Password must contain at least one alphabet, one digit, and one symbol.' - ), + // Validate password + body('password') + .isLength({ min: 8, max: 16 }) + .withMessage('Password must be between 8 and 16 characters long.') + .matches(/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[\W_])/) + .withMessage( + 'Password must contain at least one alphabet, one digit, and one symbol.' + ), - // Middleware to handle the validation result - (req, res, next) => { - const errors = validationResult(req); - if (!errors.isEmpty()) { - return res.status(400).json({ message: errors.array()[0].msg }); - } - next(); - }, + // Middleware to handle the validation result + (req, res, next) => { + const errors = validationResult(req); + if (!errors.isEmpty()) { + return res.status(400).json({ message: errors.array()[0].msg }); + } + next(); + }, ]; module.exports = { - validateRegistration, + validateRegistration, }; \ No newline at end of file diff --git a/backend/server.js b/backend/server.js index 2b10f06..b083d9c 100644 --- a/backend/server.js +++ b/backend/server.js @@ -24,16 +24,16 @@ const allowedOrigins = [ ]; app.use( - cors({ - origin: function (origin, callback) { - if (!origin || allowedOrigins.includes(origin)) { - callback(null, true); - } else { - callback(new Error('Not allowed by CORS')); - } - }, - credentials: true, - }) + cors({ + origin: function (origin, callback) { + if (!origin || allowedOrigins.includes(origin)) { + callback(null, true); + } else { + callback(new Error('Not allowed by CORS')); + } + }, + credentials: true, + }) ); app.use(express.json()); @@ -52,16 +52,16 @@ app.use('/api/recurring', require('./routes/recurringTransactionRoutes')); app.use('/uploads', express.static(path.join(__dirname, 'uploads'))); app.get('/', (req, res) => { - res.send('API is Running'); + res.send('API is Running'); }); const PORT = process.env.PORT || 5000; const server = app.listen(PORT, () => - console.log(`Server started on port ${PORT}`) + console.log(`Server started on port ${PORT}`) ); -cron.schedule("*/10 * * * *", async() => { +cron.schedule("*/10 * * * *", async () => { const keepAliveUrl = process.env.KEEP_ALIVE_URL; if (!keepAliveUrl) { console.error( @@ -79,4 +79,3 @@ cron.schedule("*/10 * * * *", async() => { }); module.exports = { app, server }; -module.exports = { app, server };