we have auth. now

routes/auth.route.js

@@ -1,100 +1,113 @@
-const express = require('express');
+const express = require("express");
 const router = express.Router({ mergeParams: true });
-const siwe = require('siwe');
-const bs58 = require('bs58');
-const nacl = require('tweetnacl');
+const siwe = require("siwe");
+const bs58 = require("bs58");
+const nacl = require("tweetnacl");
 
-const { Nonce, AuthToken } = require('../models/index.js');
-const { generateNonce, generateBearerToken } = require('../utils/index.js');
+const { verifyToken } = require("../middlewares/auth.middleware.js");
+const { Nonces, AuthTokens } = require("../models/index.js");
+const { generateNonce, generateBearerToken } = require("../utils/index.js");
 
-router.get('/nonce', async (req, res) => {
-  const { address, type } = req.query;
+router.get("/nonce", async (req, res) => {
+  const { address: walletAddress, type: networkType } = req.query;
 
-  if (!address || !type) {
-    return res.status(400).json({ error: 'Missing address or type' });
+  if (!walletAddress || !networkType) {
+    return res
+      .status(400)
+      .json({ error: "Missing walletAddress or networkType" });
   }
 
-  if (type !== 'ethereum' && type !== 'solana') {
-    return res.status(400).json({ error: 'Invalid type. Must be "ethereum" or "solana"' });
+  if (networkType !== "ethereum" && type !== "solana") {
+    return res
+      .status(400)
+      .json({ error: 'Invalid networkType. Must be "ethereum" or "solana"' });
   }
 
   const nonce = generateNonce();
 
   try {
-    await Nonce.findOneAndUpdate(
-      { address, type },
-      { address, nonce, type },
-      { upsert: true, new: true }
+    await Nonces.findOneAndUpdate(
+      { walletAddress, networkType },
+      { walletAddress, nonce, networkType },
+      { upsert: true, new: true },
     );
 
     res.json({ nonce });
   } catch (error) {
-    res.status(500).json({ error: 'Server error' });
+    res.status(500).json({ error: "Server error" });
   }
 });
 
-router.post('/verify', async (req, res) => {
-  const { message, address, signature } = req.body;
+router.post("/verify", async (req, res) => {
+  const { message, walletAddress, signature } = req.body;
 
-  if (!address || !signature) {
-    return res.status(400).json({error: 'Missing address or signature'});
+  if (!walletAddress || !signature) {
+    return res
+      .status(400)
+      .json({ error: "Missing walletAddress or signature" });
   }
 
-  const nonce = await Nonce.findOne({ address }).lean().select('-__v -updatedAt');
-  const type = nonce.type;
+  const nonce = await Nonces.findOne({ walletAddress })
+    .lean()
+    .select("-__v -updatedAt");
+  const networkType = nonce.networkType;
 
   try {
-    if (type === 'ethereum') {
+    if (networkType === "ethereum") {
       if (!message) {
-        return res.status(400).json({ error: 'Missing SiweMessage' });
+        return res.status(400).json({ error: "Missing SiweMessage" });
       }
       const siweMessage = new siwe.SiweMessage(message);
-      const fields = await siweMessage.verify({ signature, nonce: nonce.nonce });
-      if (address == fields.address)
-        throw new Error('Invalid signature');
-    } else if (type === 'solana') {
+      const fields = await siweMessage.verify({
+        signature,
+        nonce: nonce.nonce,
+      });
+      if (walletAddress == fields.walletAddress)
+        throw new Error("Invalid signature");
+    } else if (networkType === "solana") {
       const signatureUint8 = bs58.default.decode(signature);
       const messageUint8 = new TextEncoder().encode(nonce.nonce);
-      const publicKeyUint8 = bs58.default.decode(address);
+      const publicKeyUint8 = bs58.default.decode(walletAddress);
 
-      const isValid = nacl.sign.detached.verify(messageUint8, signatureUint8, publicKeyUint8);
+      const isValid = nacl.sign.detached.verify(
+        messageUint8,
+        signatureUint8,
+        publicKeyUint8,
+      );
       if (!isValid) {
-        throw new Error('Invalid signature');
+        throw new Error("Invalid signature");
       }
     } else {
-      return res.status(400).json({ error: 'Invalid type. Must be "ethereum" or "solana"' });
+      return res
+        .status(400)
+        .json({ error: 'Invalid networkType. Must be "ethereum" or "solana"' });
     }
 
-    const auth_token = generateBearerToken();
+    const authToken = generateBearerToken();
 
-    await AuthToken.findOneAndUpdate(
-      { address, type },
-      { auth_token, createdAt: new Date() },
-      { upsert: true, new: true, setDefaultsOnInsert: true }
+    await AuthTokens.findOneAndUpdate(
+      { walletAddress, networkType },
+      { authToken, createdAt: new Date() },
+      { upsert: true, new: true, setDefaultsOnInsert: true },
     );
-    await Nonce.deleteOne({ address, type });
+    await Nonces.deleteOne({ walletAddress, networkType });
 
-    res.json({ auth_token });
+    res.json({ authToken });
   } catch (error) {
     res.status(400).json({ error: `${error.message}, ${error.stack}` });
   }
 });
 
-router.delete('/auth/signoff', async (req, res) => {
-  const authHeader = req.headers['authorization'];
-  const token = authHeader && authHeader.split(' ')[1];
-
-  if (!token) {
-    return res.status(400).json({ error: 'Missing authorization token in header'});
-  }
-
-  const deletedAuth = AuthToken.findOneAndDelete({ auth_token: token });
+router.delete("/signoff", verifyToken, async (req, res) => {
+  const deletedAuth = AuthTokens.findOneAndDelete({
+    authToken: tokenRecord.authToken,
+  });
 
   if (!deletedAuth) {
-    return res.status(400).json({ error: 'Can\'t log out, not logged in?' });
+    return res.status(400).json({ error: "Can't log out, not logged in?" });
   }
 
-  return res.status(204).json({ error: 'Logged out successfully.' });
+  return res.status(204).json({ error: "Logged out successfully." });
 });
 
 module.exports = router;