From f1c9fc44d19e876611bc3a19dd7858b15060c5f2 Mon Sep 17 00:00:00 2001 From: counterweight Date: Mon, 10 Feb 2025 00:31:45 +0100 Subject: [PATCH] refactor and bug fix --- src/routes/apiRoutes.js | 6 +++--- src/routes/webRoutes.js | 8 ++++---- .../{appInviteServices.js => appInviteService.js} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename src/services/{appInviteServices.js => appInviteService.js} (100%) diff --git a/src/routes/apiRoutes.js b/src/routes/apiRoutes.js index c3177f1..5ab0517 100644 --- a/src/routes/apiRoutes.js +++ b/src/routes/apiRoutes.js @@ -3,7 +3,7 @@ const uuid = require("uuid"); const SessionNpubbed = require('../models/SessionNpubbed'); -const appInviteServices = require('../services/appInviteServices') +const appInviteService = require('../services/appInviteService') const invitedNpubService = require('../services/invitedNpubService') const router = express.Router(); @@ -49,11 +49,11 @@ router.post('/invited-npub', async (req, res) => { const inviteUuid = req.cookies.inviteUuid; const npub = req.body.npub; - if (!appInviteServices.appInviteExists(inviteUuid)) { + if (await !appInviteService.appInviteExists(inviteUuid)) { return res.status(404).render('error', { message: 'Invite not found' }); } - if (await appInviteServices.isAppInviteSpent(inviteUuid)) { + if (await appInviteService.isAppInviteSpent(inviteUuid)) { return res.status(410).json({ error: 'Invite has already been used.' }); } diff --git a/src/routes/webRoutes.js b/src/routes/webRoutes.js index 24a40a0..4cc7680 100644 --- a/src/routes/webRoutes.js +++ b/src/routes/webRoutes.js @@ -1,7 +1,7 @@ const express = require('express'); const router = express.Router(); -const appInviteServices = require('../services/appInviteServices') +const appInviteService = require('../services/appInviteService') router.get('/', (req, res) => { res.render('index', { uuid: req.cookies.sessionUuid }); @@ -14,13 +14,13 @@ router.get('/invite/:inviteUuid', async (req, res) => { try { - if (!appInviteServices.appInviteExists(inviteUuid)) { + if (await !appInviteService.appInviteExists(inviteUuid)) { return res.status(404).render('error', { message: 'Invite not found' }); } - const invite = await appInviteServices.getAppInvite(inviteUuid); + const invite = await appInviteService.getAppInvite(inviteUuid); - if (await appInviteServices.isAppInviteSpent(inviteUuid)) { + if (await appInviteService.isAppInviteSpent(inviteUuid)) { return res.render('invite_spent', { invite }) } diff --git a/src/services/appInviteServices.js b/src/services/appInviteService.js similarity index 100% rename from src/services/appInviteServices.js rename to src/services/appInviteService.js