nostr challenge step much more robust

src/routes/apiRoutes.js

@@ -1,5 +1,4 @@
 const express = require('express');
-const crypto = require("crypto");
 
 const invitesService = require('../services/invitesService');
 const nostrService = require('../services/nostrService');
@@ -9,17 +8,48 @@ const errors = require('../errors');
 const router = express.Router();
 
 router.get('/signup/nostr-challenge', async (req, res) => {
+    console.log("I'm heeeere")
     const inviteUuid = req.cookies.inviteUuid;
 
-    const signUpChallenge = await invitesService.createSignUpChallenge(
-        inviteUuid
-    )
+    let signUpChallenge;
+    try {
+        signUpChallenge = await invitesService.createSignUpChallenge(
+            inviteUuid
+        )
+    } catch (error) {
+        if (error instanceof errors.NotFoundError) {
+            return res.status(404).json({
+                success: false,
+                message: 'Could not find invite with that id.'
+            })
+        }
 
-    const relatedNostrChallenge = await nostrService.getNostrChallenge(
-        signUpChallenge.nostr_challenge_uuid
-    )
+        if (error instanceof errors.AlreadyUsedError) {
+            return res.status(410).json({
+                success: false,
+                message: 'That invite has already been used.'
+            })
+        }
 
-    res.status(200).json({ 'challenge': relatedNostrChallenge.challenge });
+        return res.status(500).json({
+            success: false,
+            message: 'Unexpected error.'
+        })
+    }
+
+    let relatedNostrChallenge;
+    try {
+        relatedNostrChallenge = await nostrService.getNostrChallenge(
+            signUpChallenge.nostr_challenge_uuid
+        )
+    } catch (error) {
+        return res.status(500).json({
+            success: false,
+            message: 'Unexpected error.'
+        })
+    }
+
+    return res.status(200).json({ 'challenge': relatedNostrChallenge.challenge });
 });
 
 
@@ -34,7 +64,7 @@ router.post("/signup/nostr-verify", async (req, res) => {
         if (error instanceof TimeoutError) {
             console.error('The challenge is outdated.');
         }
-        if (error instanceof errors.ChallengedUsedError) {
+        if (error instanceof errors.AlreadyUsedError) {
             console.error('The challenge was already used, request a new one.');
         }
         if (error instanceof errors.InvalidSignatureError) {

src/routes/webRoutes.js

@@ -13,24 +13,23 @@ router.get('/invite/:inviteUuid', async (req, res) => {
 
     res.cookie('inviteUuid', inviteUuid, { httpOnly: true, maxAge: 86400000 });
 
+    let invite;
     try {
-
-        if (await !invitesService.appInviteExists(inviteUuid)) {
-            return res.status(404).render('error', { message: 'Invite not found' });
+        invite = await invitesService.getAppInvite(inviteUuid);
+        if (!invite) {
+            return res.status(404).render('error', { message: 'Invite not found.' });
         }
 
-        const invite = await invitesService.getAppInvite(inviteUuid);
-
         if (await invitesService.isAppInviteSpent(inviteUuid)) {
-            return res.render('invite_spent', { invite })
+            return res.status(410).render('invite_spent', { invite })
         }
 
-        return res.render('invite', { invite });
-
     } catch (error) {
         console.error('Error fetching invite:', error);
         return res.status(500).render('error', { message: 'An error occurred' });
     }
+
+    return res.render('invite', { invite });
 });
 
 router.get('/private', authMiddleware, (req, res) => {