Cleanups

jsconfig.json

@@ -23,6 +23,9 @@
             "@/contexts/*": [
                 "contexts/*"
             ],
+            "@/middlewares/*": [
+                "middlewares/*"
+            ],
         }
     },
     "exclude": [

next-sitemap.config.js

@@ -1,7 +1,7 @@
 module.exports = {
-    siteUrl: 'https://theconvo.space',
-    changefreq: 'daily',
-    priority: 0.7,
-    sitemapSize: 5000,
-    generateRobotsTxt: true,
-  }
+  siteUrl: 'https://theconvo.space',
+  changefreq: 'daily',
+  priority: 0.7,
+  sitemapSize: 5000,
+  generateRobotsTxt: true,
+}

pages/api/auth.js

@@ -3,7 +3,7 @@ import { isAddress, verifyMessage } from 'ethers/lib/utils';
 import nacl from 'tweetnacl';
 const { Crypto } = require("@peculiar/webcrypto");
 
-import withApikey from 'middlewares/withApikey';
+import withApikey from "@middlewares/withApikey";
 
 async function validateNearSignature(data, signature, signerAddress){
   const tokenMessage = new TextEncoder().encode(data);

pages/api/comment.js

@@ -1,5 +1,5 @@
 import { getComment } from "@/lib/thread-db";
-import withApikey from "middlewares/withApikey";
+import withApikey from "@middlewares/withApikey";
 
 const handler = async(req, res) => {
 

pages/api/comments.js

@@ -1,6 +1,7 @@
 import validateAuth from "@/lib/validateAuth";
 import { createComment, deleteComment, getComments } from "@/lib/thread-db";
 import { Where } from "@textile/hub";
+import withApikey from "@middlewares/withApikey";
 
 function isValidUrl(string) {
   let url;
@@ -14,20 +15,7 @@ function isValidUrl(string) {
   return url.protocol === "http:" || url.protocol === "https:";
 }
 
-export default async (req, res) => {
-
-  // Required for CORS/Pre-flight Check.
-  if (req.method === 'OPTIONS') {
-    return res.status(200).end();
-  }
-
-  // Validate API Key
-  if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-    return res.status(401).json({
-      'success': false,
-      'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-    });
-  }
+const handler = async(req, res) => {
 
   try {
 
@@ -211,3 +199,5 @@ export default async (req, res) => {
     return res.status(500).json({ success: false,'error':error.toString() });
   }
 }
+
+export default withApikey(handler);

pages/api/custom/lb.js

@@ -1,13 +1,7 @@
 import { getTrustScores } from "@/lib/thread-db";
+import withApikey from "@/middlewares/withApikey";
 
-export default async (req, res) => {
-
-  if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-    return res.status(401).json({
-      'success':false,
-      'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-    });
-  }
+const handler = async(req, res) => {
 
   try {
 
@@ -38,3 +32,5 @@ export default async (req, res) => {
     return res.status(500).json({ 'success': false, error });
   }
 }
+
+export default withApikey(handler)

pages/api/getAblyAuth.js

@@ -1,20 +1,11 @@
 import Ably from "ably/promises";
+import withApikey from "@middlewares/withApikey";
 
-export default async function handler(req, res) {
-
-    if (req.method === 'OPTIONS') {
-        return res.status(200).end();
-    }
-
-    if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-        return res.status(401).json({
-            'success':false,
-            'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-        });
-    }
-
+const handler = async(req, res) => {
 
     const client = new Ably.Realtime(process.env.ABLY_SUBSCRIBE_API_KEY);
     const tokenRequestData = await client.auth.createTokenRequest({ clientId: 'convo' });
     res.status(200).json(tokenRequestData);
 }
+
+export default withApikey(handler)

pages/api/identity.js

@@ -4,6 +4,7 @@ import { Where , ThreadID} from '@textile/hub';
 import { ethers } from "ethers";
 import { getAddress, isAddress } from 'ethers/lib/utils';
 import fetcher from '@/utils/fetcher';
+import withApikey from "@/middlewares/withApikey";
 
 async function calculateScore(address) {
     let tp = new ethers.providers.AlchemyProvider("mainnet","hHgRhUVdMTMcG3_gezsZSGAi_HoK43cA");
@@ -144,18 +145,7 @@ async function setCache(address, scoreData) {
     }]);
 }
 
-export default async (req, res) => {
-
-    if (req.method === 'OPTIONS') {
-        return res.status(200).end();
-    }
-
-    if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-        return res.status(401).json({
-          'success': false,
-          'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-        });
-    }
+const handler = async(req, res) => {
 
     try {
 
@@ -218,3 +208,6 @@ export default async (req, res) => {
         return res.status(500).json({ 'success': false, error });
     }
 }
+
+
+export default withApikey(handler)

pages/api/threads.js

@@ -1,17 +1,7 @@
 import { getThread, getThreads, getAllThreads } from "@/lib/thread-db";
+import withApikey from "@/middlewares/withApikey";
 
-export default async (req, res) => {
-
-  if (req.method === 'OPTIONS') {
-    return res.status(200).end();
-  }
-
-  if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-    return res.status(401).json({
-      'success':false,
-      'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-    });
-  }
+const handler = async(req, res) => {
 
   try {
 
@@ -32,3 +22,6 @@ export default async (req, res) => {
     return res.status(500).json({ 'success': false, error });
   }
 }
+
+
+export default withApikey(handler)

pages/api/validateAuth.js

@@ -1,17 +1,7 @@
+import withApikey from '@/middlewares/withApikey';
 import jwt from 'jsonwebtoken'
 
-export default async (req, res) => {
-
-    if (req.method === 'OPTIONS') {
-        return res.status(200).end();
-    }
-
-    if (Object.keys(req.query).includes('apikey') === false || req.query.apikey !== 'CONVO' ){
-        return res.status(401).json({
-          'success': false,
-          'error': 'Invalid API key, please refer to the integration docs at https://docs.theconvo.space/ to see how to get and use a new API key.'
-        });
-    }
+const handler = async(req, res) => {
 
     try {
 
@@ -61,3 +51,5 @@ export default async (req, res) => {
 
     }
 }
+
+export default withApikey(handler)

pages/api/vote.js

@@ -1,7 +1,8 @@
 import validateAuth from "@/lib/validateAuth";
 import  { toggleUpvote, toggleDownvote } from "@/lib/thread-db";
+import withApikey from "@/middlewares/withApikey";
 
-export default async (req, res) => {
+const handler = async(req, res) => {
 
     if (req.method === 'OPTIONS') {
         return res.status(200).end();
@@ -72,3 +73,5 @@ export default async (req, res) => {
 
     }
 }
+
+export default withApikey(handler);