From 966d95149002881b9eb7a4e806a513cd47fb74c5 Mon Sep 17 00:00:00 2001 From: counterweight Date: Wed, 5 Mar 2025 16:07:57 +0100 Subject: [PATCH] pass in middlwares --- src/dependencies.js | 2 +- src/routes/apiRoutes.js | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dependencies.js b/src/dependencies.js index 4e44210..febcfc7 100644 --- a/src/dependencies.js +++ b/src/dependencies.js @@ -17,7 +17,7 @@ function buildDependencies() { dependencies.webRoutes = webRoutesProvider.provide(); const ApiRoutesProvider = require('./routes/apiRoutes'); - const apiRoutesProvider = new ApiRoutesProvider(); + const apiRoutesProvider = new ApiRoutesProvider(middlewares); dependencies.apiRoutes = apiRoutesProvider.provide(); return dependencies; } diff --git a/src/routes/apiRoutes.js b/src/routes/apiRoutes.js index f3a0bdc..7bfebb0 100644 --- a/src/routes/apiRoutes.js +++ b/src/routes/apiRoutes.js @@ -7,8 +7,6 @@ const sessionService = require('../services/sessionService'); const profileServiceProvider = require('../services/profileService'); const offerService = require('../services/offerService'); const errors = require('../errors'); -const attachPublicKeyMiddleware = require('../middlewares/attachPublicKeyMiddleware'); -const rejectIfNotAuthorizedMiddleware = require('../middlewares/rejectIfNotAuthorizedMiddleware'); const ContactDetailsSet = require('../models/ContactDetailsSet'); const NymSet = require('../models/NymSet'); @@ -17,7 +15,9 @@ const profileService = profileServiceProvider(ContactDetailsSet, NymSet); const router = express.Router(); class ApiRoutesProvider { - constructor() {} + constructor(middlewares) { + this.middlewares = middlewares; + } provide() { router.get('/signup/nostr-challenge', async (req, res) => { @@ -184,8 +184,8 @@ class ApiRoutesProvider { router.post( '/set-contact-details', - rejectIfNotAuthorizedMiddleware, - attachPublicKeyMiddleware, + this.middlewares.rejectIfNotAuthorizedMiddleware, + this.middlewares.attachPublicKeyMiddleware, async (req, res) => { const encryptedContactDetails = req.body.encryptedContactDetails; const publicKey = req.cookies.publicKey; @@ -211,8 +211,8 @@ class ApiRoutesProvider { router.post( '/set-nym', - rejectIfNotAuthorizedMiddleware, - attachPublicKeyMiddleware, + this.middlewares.rejectIfNotAuthorizedMiddleware, + this.middlewares.attachPublicKeyMiddleware, async (req, res) => { const nym = req.body.nym; const publicKey = req.cookies.publicKey; @@ -235,8 +235,8 @@ class ApiRoutesProvider { router.post( '/offer', - rejectIfNotAuthorizedMiddleware, - attachPublicKeyMiddleware, + this.middlewares.rejectIfNotAuthorizedMiddleware, + this.middlewares.attachPublicKeyMiddleware, async (req, res) => { const publicKey = req.cookies.publicKey; const offerDetails = req.body.offerDetails; @@ -252,8 +252,8 @@ class ApiRoutesProvider { router.delete( '/offer/:offerUuid', - rejectIfNotAuthorizedMiddleware, - attachPublicKeyMiddleware, + this.middlewares.rejectIfNotAuthorizedMiddleware, + this.middlewares.attachPublicKeyMiddleware, async (req, res) => { const offerUuid = req.params.offerUuid; @@ -281,8 +281,8 @@ class ApiRoutesProvider { router.get( '/publickey-offers', - rejectIfNotAuthorizedMiddleware, - attachPublicKeyMiddleware, + this.middlewares.rejectIfNotAuthorizedMiddleware, + this.middlewares.attachPublicKeyMiddleware, async (req, res) => { console.log('elo'); const publicKey = req.cookies.publicKey;