From 7702f64af014cb7c5a4b23da06531fad6ac3da75 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 14:41:40 +0530 Subject: [PATCH 1/6] feat: margin bottom --- src/components/organisms/ApiKey.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/organisms/ApiKey.tsx b/src/components/organisms/ApiKey.tsx index 8133ae39..730a2a03 100644 --- a/src/components/organisms/ApiKey.tsx +++ b/src/components/organisms/ApiKey.tsx @@ -89,7 +89,7 @@ const ApiKeyManager = () => { return ( - Manage Your API Key + Manage Your API Key {apiKey ? ( From 0cec3b6a6cdc8e4ee2e7a0c048ba090ed884a8e8 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 16:26:11 +0530 Subject: [PATCH 2/6] feat: remove /api --- server/src/api/record.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/api/record.ts b/server/src/api/record.ts index a7e39029..e988ad49 100644 --- a/server/src/api/record.ts +++ b/server/src/api/record.ts @@ -27,7 +27,7 @@ const formatRecording = (recordingData: any) => { }; -router.get("/api/robots", requireAPIKey, async (req: Request, res: Response) => { +router.get("/robots", requireAPIKey, async (req: Request, res: Response) => { try { const fileContents = await readFiles('./../storage/recordings/'); @@ -80,7 +80,7 @@ const formatRecordingById = (recordingData: any) => { }; }; -router.get("/api/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { +router.get("/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { try { const fileContent = await readFile(`./../storage/recordings/${req.params.fileName}.waw.json`); From 3746868e3827719c4cea240d649fea1f6053409e Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 16:28:14 +0530 Subject: [PATCH 3/6] fix: revert changes --- server/src/api/index.ts | 1 + server/src/api/record.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 server/src/api/index.ts diff --git a/server/src/api/index.ts b/server/src/api/index.ts new file mode 100644 index 00000000..f23bf00e --- /dev/null +++ b/server/src/api/index.ts @@ -0,0 +1 @@ +import { router as record } from './record'; \ No newline at end of file diff --git a/server/src/api/record.ts b/server/src/api/record.ts index e988ad49..a7e39029 100644 --- a/server/src/api/record.ts +++ b/server/src/api/record.ts @@ -27,7 +27,7 @@ const formatRecording = (recordingData: any) => { }; -router.get("/robots", requireAPIKey, async (req: Request, res: Response) => { +router.get("/api/robots", requireAPIKey, async (req: Request, res: Response) => { try { const fileContents = await readFiles('./../storage/recordings/'); @@ -80,7 +80,7 @@ const formatRecordingById = (recordingData: any) => { }; }; -router.get("/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { +router.get("/api/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { try { const fileContent = await readFile(`./../storage/recordings/${req.params.fileName}.waw.json`); From c7b006226e1ebaca67b162965695d8e5c0c46b1f Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 16:34:30 +0530 Subject: [PATCH 4/6] feat: use /api routes properly --- server/src/server.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/src/server.ts b/server/src/server.ts index ba44d260..3dbccd05 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -12,6 +12,7 @@ import cookieParser from 'cookie-parser'; import csrf from 'csurf'; import { SERVER_PORT } from "./constants/config"; import { Server } from "socket.io"; +import { readdirSync } from "fs" const csrfProtection = csrf({ cookie: true }) @@ -48,6 +49,8 @@ app.use('/auth', auth); app.use('/integration', integration); app.use('/proxy', proxy); +readdirSync('./api').map(r => app.use('/api', require(`./api/${r}`))) + app.get('/', function (req, res) { return res.send('Maxun server started 🚀'); }); From 05ebe1d7ad7c6a20c2ee1f93a4f5dc4d0cfc7e8e Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 17:18:35 +0530 Subject: [PATCH 5/6] fix: remove /api from individual roites --- server/src/api/index.ts | 1 - server/src/api/record.ts | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 server/src/api/index.ts diff --git a/server/src/api/index.ts b/server/src/api/index.ts deleted file mode 100644 index f23bf00e..00000000 --- a/server/src/api/index.ts +++ /dev/null @@ -1 +0,0 @@ -import { router as record } from './record'; \ No newline at end of file diff --git a/server/src/api/record.ts b/server/src/api/record.ts index a7e39029..c6c90b26 100644 --- a/server/src/api/record.ts +++ b/server/src/api/record.ts @@ -1,7 +1,7 @@ import { readFile, readFiles } from "../workflow-management/storage"; import { Router, Request, Response } from 'express'; import { requireAPIKey } from "../middlewares/api"; -export const router = Router(); +const router = Router(); const formatRecording = (recordingData: any) => { const recordingMeta = recordingData.recording_meta; @@ -27,7 +27,7 @@ const formatRecording = (recordingData: any) => { }; -router.get("/api/robots", requireAPIKey, async (req: Request, res: Response) => { +router.get("/robots", requireAPIKey, async (req: Request, res: Response) => { try { const fileContents = await readFiles('./../storage/recordings/'); @@ -80,7 +80,7 @@ const formatRecordingById = (recordingData: any) => { }; }; -router.get("/api/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { +router.get("/robots/:fileName", requireAPIKey, async (req: Request, res: Response) => { try { const fileContent = await readFile(`./../storage/recordings/${req.params.fileName}.waw.json`); @@ -103,3 +103,5 @@ router.get("/api/robots/:fileName", requireAPIKey, async (req: Request, res: Res }); } }); + +export default router; \ No newline at end of file From 8b6c807642589473662e7b86458feb20292ce1ef Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Thu, 3 Oct 2024 17:19:20 +0530 Subject: [PATCH 6/6] feat: import api routes globally --- server/src/server.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/server/src/server.ts b/server/src/server.ts index 3dbccd05..cfd67d09 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,4 +1,5 @@ import express from 'express'; +import path from 'path'; import http from 'http'; import cors from 'cors'; import dotenv from 'dotenv'; @@ -49,7 +50,15 @@ app.use('/auth', auth); app.use('/integration', integration); app.use('/proxy', proxy); -readdirSync('./api').map(r => app.use('/api', require(`./api/${r}`))) +readdirSync(path.join(__dirname, 'api')).forEach((r) => { + const route = require(path.join(__dirname, 'api', r)); + const router = route.default || route; // Use .default if available, fallback to route + if (typeof router === 'function') { + app.use('/api', router); // Use the default export or named router + } else { + console.error(`Error: ${r} does not export a valid router`); + } +}); app.get('/', function (req, res) { return res.send('Maxun server started 🚀');