From 045c3260792aa6eb65ef04f68a06f32ad3765338 Mon Sep 17 00:00:00 2001 From: Joseph Kingsley Date: Wed, 24 Sep 2025 13:42:43 +0100 Subject: [PATCH 1/5] chore:Initialized backend project structure and dependencies --- .gitignore | 3 + backend/app.js | 32 + backend/config/db.js | 14 + backend/controllers/authControllers.js | 45 + backend/index.js | 18 + backend/middlewares/errorHandler.js | 12 + backend/middlewares/rate-limiter.js | 12 + backend/middlewares/validate.js | 21 + backend/models/userModel.js | 19 + backend/routes/authRoutes.js | 59 ++ backend/routes/index.js | 9 + backend/validators/authSchema.js | 19 + package-lock.json | 1048 +++++++++++++++++++++++- package.json | 16 +- 14 files changed, 1309 insertions(+), 18 deletions(-) create mode 100644 backend/app.js create mode 100644 backend/config/db.js create mode 100644 backend/controllers/authControllers.js create mode 100644 backend/index.js create mode 100644 backend/middlewares/errorHandler.js create mode 100644 backend/middlewares/rate-limiter.js create mode 100644 backend/middlewares/validate.js create mode 100644 backend/models/userModel.js create mode 100644 backend/routes/authRoutes.js create mode 100644 backend/routes/index.js create mode 100644 backend/validators/authSchema.js diff --git a/.gitignore b/.gitignore index d914c32..77fd862 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ yarn-error.* # generated native folders /ios /android + +# ignore env files +.env diff --git a/backend/app.js b/backend/app.js new file mode 100644 index 0000000..2a81e7c --- /dev/null +++ b/backend/app.js @@ -0,0 +1,32 @@ +const express = require('express') +const rateLimiter = require('./middlewares/rate-limiter') +const morgan = require('morgan') +const cors = require('cors') +const routes = require('./routes') +const {errorLogging, notFound} = require('./middlewares/errorHandler') + +const app = express() +app.use(morgan('dev')) +app.use(cors({ + origin:true +})) +app.use(express.json()) +app.use(express.urlencoded({extended:true})) + + +app.use('/api', rateLimiter) +app.use('/api', routes) + +app.get('/', (req,res)=>{ + res.status(200).json({ + message: 'Welcome to Engiconnect', + health: 'ok' + }); +}) +app.use(notFound) +app.use(errorLogging) + + + + +module.exports = app \ No newline at end of file diff --git a/backend/config/db.js b/backend/config/db.js new file mode 100644 index 0000000..ecc4067 --- /dev/null +++ b/backend/config/db.js @@ -0,0 +1,14 @@ + + +const { createClient } = require("@supabase/supabase-js"); +const dotenv = require('dotenv') +dotenv.config(); + +const supabase = createClient( + process.env.SUPABASE_URL, + process.env.SUPABASE_ANON_KEY +) + + + +module.exports = supabase; diff --git a/backend/controllers/authControllers.js b/backend/controllers/authControllers.js new file mode 100644 index 0000000..1615493 --- /dev/null +++ b/backend/controllers/authControllers.js @@ -0,0 +1,45 @@ +const { getUserByWallet} = require("../models/userModel"); +const jwt = require('jsonwebtoken') + + +const loginController = async(req,res,next)=>{ +try { + console.log(req.body) + const {wallet_address} = req.body + const {user} = getUserByWallet(wallet_address) + + console.log(user) + + if (error || !user) { + return res.status(400).json({ error: "Invalid wallet address" }); + } + + // Compare password + const match = await bcrypt.compare(password, users.password); + if (!match) { + return res.status(400).json({ error: "Invalid email or password" }); + } + const expirty = '1h' + const token = jwt.sign( + { userWallet:user.wallet_address }, + process.env.JWT_SECRET, + { expiresIn: expirty } + ); + + + + res.status(200).json({ + access_token: token, + refresh_token: token, + user, + expires_in: 3600 + }); + + } catch (err) { + console.log(err) + next(err); + } +} + + +module.exports = {loginController} diff --git a/backend/index.js b/backend/index.js new file mode 100644 index 0000000..590627f --- /dev/null +++ b/backend/index.js @@ -0,0 +1,18 @@ + +const app = require('./app') + +const dotenv = require('dotenv') +dotenv.config(); +(async()=>{ + + // GracefulShutdown + ['SIGINT', 'SIGTERM', 'SIGQUIT'].forEach(signal => { + process.on(signal, async () => { + console.log(`Received ${signal}, shutting down gracefully...`); + })}); + + + app.listen(process.env.PORT || 4000, () => { + console.log(`Server is running on port ${process.env.PORT || 4000}`); + }) +})() diff --git a/backend/middlewares/errorHandler.js b/backend/middlewares/errorHandler.js new file mode 100644 index 0000000..bde3680 --- /dev/null +++ b/backend/middlewares/errorHandler.js @@ -0,0 +1,12 @@ +const notFound=(req,res,next)=>{ + + return res.status(404).json({message:'Invalid url',url:req.originalUrl}) +} + +const errorLogging =(err,req,res,next)=>{ + + console.log(err.stack) + return res.status(500).json({message:'Server error'}) +} + +module.exports = { errorLogging, notFound} \ No newline at end of file diff --git a/backend/middlewares/rate-limiter.js b/backend/middlewares/rate-limiter.js new file mode 100644 index 0000000..ded20b3 --- /dev/null +++ b/backend/middlewares/rate-limiter.js @@ -0,0 +1,12 @@ +const rateLimit = require ("express-rate-limit"); + + + const rateLimiter = rateLimit({ + windowMs: 15 * 60 * 1000, // 15 minutes + max: 100, + standardHeaders: true, + legacyHeaders: false, + message: 'Too many requests from this IP, please try again after 15 minutes' +}); + +module.exports = rateLimiter \ No newline at end of file diff --git a/backend/middlewares/validate.js b/backend/middlewares/validate.js new file mode 100644 index 0000000..ff7ac00 --- /dev/null +++ b/backend/middlewares/validate.js @@ -0,0 +1,21 @@ +const validate = (Schema)=>async(req,res,next)=>{ + + try { + const result = Schema.safeParse(req.body); + if (!result.success) { + + return res.status(400).json({ + message:'Validation failed', + errors: result.error.flatten().fieldErrors, + }) + } + + req.validated = result.data + next() + } catch (error) { + console.log(error); + return res.status(400).json({message:'Invalid request', error}) + } +} + +module.exports = validate \ No newline at end of file diff --git a/backend/models/userModel.js b/backend/models/userModel.js new file mode 100644 index 0000000..fcdf334 --- /dev/null +++ b/backend/models/userModel.js @@ -0,0 +1,19 @@ +const supabase = require('../config/db') + +const getAllUsers = async () => { + return await supabase.from("users").select("*"); +}; + +const createUser = async (userWalledData) => { + return await supabase.from("users").insert([userWalledData]); +}; +const getUserByWallet = async(email)=>{ + const { data: user, error } = await supabase + .from("users") + .select("*") + .eq("email", email) + .single(); // gets a single row + return {user, error} +} + +module.exports = { createUser, getAllUsers,getUserByWallet} \ No newline at end of file diff --git a/backend/routes/authRoutes.js b/backend/routes/authRoutes.js new file mode 100644 index 0000000..03ca4d0 --- /dev/null +++ b/backend/routes/authRoutes.js @@ -0,0 +1,59 @@ +const router = require('express').Router() +const validate = require('../middlewares/validate') +const {loginSchema, refreshShema, verifyEnsSchema} = require('../validators/authSchema') +const {loginController} = require('../controllers/authControllers') + +router.post('/auth/login',validate(loginSchema),loginController) + +// router.post('/auth/refresh',loginController,) + +// router.post('/auth/verify-ens',loginController,) + + +module.exports = router + +// OST /auth/login +// Wallet-based authentication + +// Request: +// { +// "wallet_address": "0x...", +// "signature": "0x...", +// "message": "Login to ENGIConnect" +// } + +// Response: +// { +// "access_token": "jwt_token", +// "refresh_token": "jwt_token", +// "user": { ... }, +// "expires_in": 3600 +// } +// POST /auth/refresh +// Refresh access token + +// Request: +// { +// "refresh_token": "jwt_token" +// } + +// Response: +// { +// "access_token": "jwt_token", +// "expires_in": 3600 +// } +// POST /auth/verify-ens +// Verify ENS domain ownership + +// Request: +// { +// "domain": "alice.ens", +// "signature": "0x..." +// } + +// Response: +// { +// "verified": true, +// "address": "0x..." +// } +// // User Management Endpoint \ No newline at end of file diff --git a/backend/routes/index.js b/backend/routes/index.js new file mode 100644 index 0000000..6656d9e --- /dev/null +++ b/backend/routes/index.js @@ -0,0 +1,9 @@ + +const router = require('express').Router() +const authRoutes = require('./authRoutes') + + +router.use('/auth',authRoutes) + + +module.exports = router \ No newline at end of file diff --git a/backend/validators/authSchema.js b/backend/validators/authSchema.js new file mode 100644 index 0000000..b925a93 --- /dev/null +++ b/backend/validators/authSchema.js @@ -0,0 +1,19 @@ +const {z} = require('zod') + +const loginSchema = z.object({ +wallet_address:z.string().min(1,{message:'wallet_address is required'}), +signature:z.string().min(1,{message:'signature is required'}), +message:z.string().min(1,{message:'message is required'}) +}) + +const refreshSchema= z.object({ + refresh_token:z.string().min(1,{message:'referesh_token is required'}) +}) + +const verifyEnsSchema = z.object({ + domain:z.string().min(1,{message:'domain is required'}), + + signature:z.string().min(1,{message:'signature is required'}) +}) + +module.exports = { loginSchema, refreshSchema, verifyEnsSchema} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index cc79561..9bf8969 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,11 +14,18 @@ "@react-navigation/bottom-tabs": "^7.4.7", "@react-navigation/native": "^7.1.17", "@react-navigation/stack": "^7.4.8", + "@supabase/supabase-js": "^2.57.4", + "cors": "^2.8.5", + "dotenv": "^17.2.2", "ethers": "^6.15.0", "expo": "~54.0.9", "expo-image-picker": "~17.0.8", "expo-linear-gradient": "^15.0.7", "expo-status-bar": "~3.0.8", + "express": "^5.1.0", + "express-rate-limit": "^8.1.0", + "jsonwebtoken": "^9.0.2", + "morgan": "^1.10.1", "nativewind": "^4.2.1", "react": "19.1.0", "react-native": "0.81.4", @@ -26,10 +33,12 @@ "react-native-reanimated": "^4.1.0", "react-native-safe-area-context": "^5.6.1", "react-native-screens": "^4.16.0", - "react-native-svg": "^15.13.0" + "react-native-svg": "^15.13.0", + "zod": "^3.25.76" }, "devDependencies": { - "babel-preset-expo": "^54.0.2" + "babel-preset-expo": "^54.0.2", + "nodemon": "^3.1.10" } }, "node_modules/@0no-co/graphql.web": { @@ -1882,6 +1891,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, + "node_modules/@expo/env/node_modules/dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/@expo/env/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3355,6 +3375,93 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@supabase/auth-js": { + "version": "2.71.1", + "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.71.1.tgz", + "integrity": "sha512-mMIQHBRc+SKpZFRB2qtupuzulaUhFYupNyxqDj5Jp/LyPvcWvjaJzZzObv6URtL/O6lPxkanASnotGtNpS3H2Q==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/functions-js": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.4.6.tgz", + "integrity": "sha512-bhjZ7rmxAibjgmzTmQBxJU6ZIBCCJTc3Uwgvdi4FewueUTAGO5hxZT1Sj6tiD+0dSXf9XI87BDdJrg12z8Uaew==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/node-fetch": { + "version": "2.6.15", + "resolved": "https://registry.npmjs.org/@supabase/node-fetch/-/node-fetch-2.6.15.tgz", + "integrity": "sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/@supabase/postgrest-js": { + "version": "1.21.4", + "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.21.4.tgz", + "integrity": "sha512-TxZCIjxk6/dP9abAi89VQbWWMBbybpGWyvmIzTd79OeravM13OjR/YEYeyUOPcM1C3QyvXkvPZhUfItvmhY1IQ==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/realtime-js": { + "version": "2.15.5", + "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.15.5.tgz", + "integrity": "sha512-/Rs5Vqu9jejRD8ZeuaWXebdkH+J7V6VySbCZ/zQM93Ta5y3mAmocjioa/nzlB6qvFmyylUgKVS1KpE212t30OA==", + "dependencies": { + "@supabase/node-fetch": "^2.6.13", + "@types/phoenix": "^1.6.6", + "@types/ws": "^8.18.1", + "ws": "^8.18.2" + } + }, + "node_modules/@supabase/realtime-js/node_modules/ws": { + "version": "8.18.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/@supabase/storage-js": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.12.1.tgz", + "integrity": "sha512-QWg3HV6Db2J81VQx0PqLq0JDBn4Q8B1FYn1kYcbla8+d5WDmTdwwMr+EJAxNOSs9W4mhKMv+EYCpCrTFlTj4VQ==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/supabase-js": { + "version": "2.57.4", + "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.57.4.tgz", + "integrity": "sha512-LcbTzFhHYdwfQ7TRPfol0z04rLEyHabpGYANME6wkQ/kLtKNmI+Vy+WEM8HxeOZAtByUFxoUTTLwhXmrh+CcVw==", + "dependencies": { + "@supabase/auth-js": "2.71.1", + "@supabase/functions-js": "2.4.6", + "@supabase/node-fetch": "2.6.15", + "@supabase/postgrest-js": "1.21.4", + "@supabase/realtime-js": "2.15.5", + "@supabase/storage-js": "2.12.1" + } + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -3444,12 +3551,25 @@ "undici-types": "~7.12.0" } }, + "node_modules/@types/phoenix": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.6.tgz", + "integrity": "sha512-PIzZZlEppgrpoT2QgbnDU+MMzuR6BbCjllj0bM70lWoejMeNJAxCchxnv7J3XFkI8MpygtRpzXrIlmWUBclP5A==" + }, "node_modules/@types/stack-utils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "license": "MIT" }, + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/yargs": { "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", @@ -3984,6 +4104,22 @@ "baseline-browser-mapping": "dist/cli.js" } }, + "node_modules/basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/basic-auth/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "node_modules/better-opn": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz", @@ -4027,7 +4163,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "license": "MIT", - "peer": true, "engines": { "node": ">=8" }, @@ -4035,6 +4170,36 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/body-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/body-parser/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -4149,6 +4314,11 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -4164,6 +4334,33 @@ "node": ">= 0.8" } }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", @@ -4258,7 +4455,6 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "license": "MIT", - "peer": true, "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -4283,7 +4479,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "license": "ISC", - "peer": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -4662,12 +4857,47 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, + "node_modules/content-disposition": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "license": "MIT" }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "engines": { + "node": ">=6.6.0" + } + }, "node_modules/core-js-compat": { "version": "3.45.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz", @@ -4687,6 +4917,18 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "license": "MIT" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", @@ -4951,10 +5193,9 @@ } }, "node_modules/dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", - "license": "BSD-2-Clause", + "version": "17.2.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.2.tgz", + "integrity": "sha512-Sf2LSQP+bOlhKWWyhFsn0UsfdK/kCWRv1iuA2gXAwt3dyNabr6QSj00I2V10pidqz69soatm9ZwZvpQMTIOd5Q==", "engines": { "node": ">=12" }, @@ -4977,12 +5218,44 @@ "url": "https://dotenvx.com" } }, + "node_modules/dotenv-expand/node_modules/dotenv": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "license": "MIT" }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -5049,6 +5322,33 @@ "stackframe": "^1.3.4" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -5609,6 +5909,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, + "node_modules/expo/node_modules/dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/expo/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5767,6 +6078,189 @@ "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", "license": "Apache-2.0" }, + "node_modules/express": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express-rate-limit": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.1.0.tgz", + "integrity": "sha512-4nLnATuKupnmwqiJc27b4dCFmB/T60ExgmtDD7waf4LdrbJ8CPZzZRHYErDYNhoz+ql8fUdYwM/opf90PoPAQA==", + "dependencies": { + "ip-address": "10.0.1" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/express-rate-limit" + }, + "peerDependencies": { + "express": ">= 4.11" + } + }, + "node_modules/express/node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/finalhandler": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "dependencies": { + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/send": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "dependencies": { + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/express/node_modules/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/express/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5923,6 +6417,14 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/freeport-async": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz", @@ -5988,6 +6490,29 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", @@ -5997,6 +6522,18 @@ "node": ">=8.0.0" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/getenv": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/getenv/-/getenv-2.0.0.tgz", @@ -6051,6 +6588,17 @@ "node": ">=4" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -6075,6 +6623,17 @@ "node": ">=8" } }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -6173,6 +6732,17 @@ "node": ">= 14" } }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -6202,6 +6772,12 @@ "node": ">= 4" } }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, "node_modules/image-size": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz", @@ -6280,6 +6856,22 @@ "loose-envify": "^1.0.0" } }, + "node_modules/ip-address": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", + "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", + "engines": { + "node": ">= 12" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -6291,7 +6883,6 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "license": "MIT", - "peer": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -6343,7 +6934,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -6362,7 +6952,6 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "license": "MIT", - "peer": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -6388,6 +6977,11 @@ "node": ">=8" } }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==" + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -6932,6 +7526,46 @@ "node": ">=6" } }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jwa": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz", + "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -7249,6 +7883,41 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "license": "MIT" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -7303,18 +7972,45 @@ "integrity": "sha512-ocnPZQLNpvbedwTy9kNrQEsknEfgvcLMvOtz3sFeWApDq1MXH1TqkCIx58xlpESsfwQOnuBO9beyQuNGzVvuhQ==", "license": "Apache-2.0" }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/mdn-data": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "license": "CC0-1.0" }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/memoize-one": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==", "license": "MIT" }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/merge-options": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", @@ -7808,6 +8504,34 @@ "node": ">=10" } }, + "node_modules/morgan": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", + "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==", + "dependencies": { + "basic-auth": "~2.0.1", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-finished": "~2.3.0", + "on-headers": "~1.1.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/morgan/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/morgan/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7896,6 +8620,56 @@ "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", "license": "MIT" }, + "node_modules/nodemon": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "dev": true, + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nodemon/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/nodemon/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -7969,6 +8743,17 @@ "node": ">= 6" } }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -8211,6 +8996,15 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, + "node_modules/path-to-regexp": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -8504,6 +9298,24 @@ "node": ">= 6" } }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -8521,6 +9333,20 @@ "qrcode-terminal": "bin/qrcode-terminal.js" } }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/query-string": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz", @@ -8578,6 +9404,35 @@ "node": ">= 0.6" } }, + "node_modules/raw-body": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.7.0", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -9149,7 +10004,6 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "license": "MIT", - "peer": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -9410,6 +10264,21 @@ "node": "*" } }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -9454,6 +10323,11 @@ ], "license": "MIT" }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", @@ -9610,6 +10484,74 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -9648,6 +10590,18 @@ "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", "license": "MIT" }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -10207,6 +11161,20 @@ "node": ">=0.6" } }, + "node_modules/touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true, + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", @@ -10237,6 +11205,44 @@ "node": ">=8" } }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, "node_modules/undici": { "version": "6.21.3", "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz", @@ -10449,6 +11455,15 @@ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==", "license": "MIT" }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/whatwg-url-without-unicode": { "version": "8.0.0-3", "resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz", @@ -10463,6 +11478,11 @@ "node": ">=10" } }, + "node_modules/whatwg-url/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -10789,7 +11809,6 @@ "version": "3.25.76", "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -10798,7 +11817,6 @@ "version": "3.24.6", "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz", "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==", - "license": "ISC", "peerDependencies": { "zod": "^3.24.1" } diff --git a/package.json b/package.json index e273e01..8b9871f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "start": "expo start", "android": "expo start --android", "ios": "expo start --ios", - "web": "expo start --web" + "web": "expo start --web", + "backend": "nodemon backend/index.js" }, "dependencies": { "@expo/vector-icons": "^15.0.2", @@ -15,11 +16,18 @@ "@react-navigation/bottom-tabs": "^7.4.7", "@react-navigation/native": "^7.1.17", "@react-navigation/stack": "^7.4.8", + "@supabase/supabase-js": "^2.57.4", + "cors": "^2.8.5", + "dotenv": "^17.2.2", "ethers": "^6.15.0", "expo": "~54.0.9", "expo-image-picker": "~17.0.8", "expo-linear-gradient": "^15.0.7", "expo-status-bar": "~3.0.8", + "express": "^5.1.0", + "express-rate-limit": "^8.1.0", + "jsonwebtoken": "^9.0.2", + "morgan": "^1.10.1", "nativewind": "^4.2.1", "react": "19.1.0", "react-native": "0.81.4", @@ -27,10 +35,12 @@ "react-native-reanimated": "^4.1.0", "react-native-safe-area-context": "^5.6.1", "react-native-screens": "^4.16.0", - "react-native-svg": "^15.13.0" + "react-native-svg": "^15.13.0", + "zod": "^3.25.76" }, "private": true, "devDependencies": { - "babel-preset-expo": "^54.0.2" + "babel-preset-expo": "^54.0.2", + "nodemon": "^3.1.10" } } From eb263c32165be0382451f3883a659626034388c7 Mon Sep 17 00:00:00 2001 From: Joseph Kingsley Date: Wed, 24 Sep 2025 13:51:57 +0100 Subject: [PATCH 2/5] chore:installed ether.js --- package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 9bf8969..074c024 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5409,7 +5409,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", From e671666b2c484ccf35fbad2f4e876ba6683f9ba4 Mon Sep 17 00:00:00 2001 From: Joseph Kingsley Date: Wed, 24 Sep 2025 16:44:58 +0100 Subject: [PATCH 3/5] feat:auth routes api --- .gitignore | 3 + backend/controllers/authControllers.js | 142 +++++++++++++++++++------ backend/middlewares/authGuard.js | 26 +++++ backend/models/userModel.js | 14 ++- backend/routes/authRoutes.js | 53 +-------- 5 files changed, 151 insertions(+), 87 deletions(-) create mode 100644 backend/middlewares/authGuard.js diff --git a/.gitignore b/.gitignore index 77fd862..39d66a3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ yarn-error.* # ignore env files .env + +# ignore test files +backend-test/ diff --git a/backend/controllers/authControllers.js b/backend/controllers/authControllers.js index 1615493..bb05e56 100644 --- a/backend/controllers/authControllers.js +++ b/backend/controllers/authControllers.js @@ -1,45 +1,119 @@ -const { getUserByWallet} = require("../models/userModel"); -const jwt = require('jsonwebtoken') +const {getUserByWallet, createUser} = require("../models/userModel"); +const jwt = require("jsonwebtoken"); +const ethers = require("ethers"); +const loginController = async (req, res, next) => { + try { + const {wallet_address, signature, message} = req.body; -const loginController = async(req,res,next)=>{ -try { - console.log(req.body) - const {wallet_address} = req.body - const {user} = getUserByWallet(wallet_address) + if (!wallet_address || !signature) return res.status(400).json({error: "Wallet and signature required"}); - console.log(user) + let user; + const {user: fetchedUser, error} = await getUserByWallet(wallet_address); + user = fetchedUser; - if (error || !user) { - return res.status(400).json({ error: "Invalid wallet address" }); - } + if (!user) { + const {data: createdUser, error} = await createUser(wallet_address); + createUser ? (user = createdUser) : null; + error ? res.status(404).json({error: "Error creating user"}) : null; + } - // Compare password - const match = await bcrypt.compare(password, users.password); - if (!match) { - return res.status(400).json({ error: "Invalid email or password" }); - } - const expirty = '1h' - const token = jwt.sign( - { userWallet:user.wallet_address }, - process.env.JWT_SECRET, - { expiresIn: expirty } - ); + let recovered; + try { + recovered = ethers.verifyMessage(message, signature); + } catch (err) { + return res.status(400).json({error: "Invalid signature format"}); + } + if (recovered.toLowerCase() !== wallet_address.toLowerCase()) { + return res.status(401).json({error: "Signature does not match wallet"}); + } + const access_token = jwt.sign({wallet_address}, process.env.JWT_SECRET, { + expiresIn: "1h", + }); - res.status(200).json({ - access_token: token, - refresh_token: token, - user, - expires_in: 3600 - }); + const refresh_token = jwt.sign({wallet_address}, process.env.JWT_SECRET, { + expiresIn: "7d", + }); - } catch (err) { - console.log(err) - next(err); - } -} + return res.status(200).json({ + message: "Login successful", + data: { + access_token, + refresh_token, + user: {id: user.id, wallet_address: user.wallet_address, created_at: user.created_at}, + expires_in: 3600, + }, + }); + } catch (err) { + console.log(err); + next(err); + } +}; +const refreshController = async (req, res, next) => { + const {refresh_token} = req.body; -module.exports = {loginController} + if (!refresh_token) { + return res.status(400).json({error: "refresh_token required"}); + } + + try { + // Verify refresh token + const decoded = jwt.verify(refresh_token, process.env.JWT_SECRET); + + // Issue a new access token + const newAccessToken = jwt.sign({wallet: decoded.wallet}, process.env.JWT_SECRET, {expiresIn: "1h"}); + + return res.status(200).json({ + access_token: newAccessToken, + expires_in: 3600, + }); + } catch (err) { + console.log(err); + return res.status(401).json({error: "Invalid or expired refresh token"}); + } +}; + +const verifyEnsController = async (req, res, next) => { + const {domain, signature, message} = req.body; + if (!message) return res.status(400).json({error: "message is required"}); + + if (!domain || !signature) { + return res.status(400).json({error: "domain and signature required"}); + } + try { + // 1. Resolve ENS domain to address + const provider = new ethers.InfuraProvider("mainnet", process.env.INFURA_API_KEY); + const resolvedAddress = await provider.resolveName(domain); + + if (!resolvedAddress) { + return res.status(404).json({error: "ENS domain not found"}); + } + + // 2. Recover address from signature + const recovered = ethers.verifyMessage(message, signature); + + console.log("ENS domain:", domain); + console.log("Resolved address:", resolvedAddress); + console.log("Recovered signer:", recovered); + + if (recovered.toLowerCase() !== resolvedAddress.toLowerCase()) { + return res.status(401).json({error: "Signature does not match ENS owner"}); + } + + return res.status(200).json({ + message: "ENS verified successfully", + data: { + verified: true, + address: resolvedAddress, + }, + }); + } catch (err) { + console.error(err); + return res.status(500).json({error: "Verification failed"}); + } +}; + +module.exports = {loginController, refreshController, verifyEnsController}; diff --git a/backend/middlewares/authGuard.js b/backend/middlewares/authGuard.js new file mode 100644 index 0000000..ee61640 --- /dev/null +++ b/backend/middlewares/authGuard.js @@ -0,0 +1,26 @@ +const jwt = require("jsonwebtoken"); + +const authMiddleware = (req, res, next) => { + + let token; + const authHeader = req.headers.authorization; + + if (authHeader && authHeader.startsWith("Bearer ")) { + token = authHeader.split(" ")[1]; + } else if (req.body.token) { + // Fallback: read from body + token = req.body.token; + } + + if (!token) { + return res.status(401).json({ error: "Token missing" }); + } + + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + req.user = decoded; + next(); + } catch (err) { + return res.status(401).json({ error: "Invalid or expired token" }); + } +}; diff --git a/backend/models/userModel.js b/backend/models/userModel.js index fcdf334..32f1351 100644 --- a/backend/models/userModel.js +++ b/backend/models/userModel.js @@ -4,14 +4,20 @@ const getAllUsers = async () => { return await supabase.from("users").select("*"); }; -const createUser = async (userWalledData) => { - return await supabase.from("users").insert([userWalledData]); +const createUser = async (wallet) => { + + const { data, error } = await supabase + .from("users") + .insert([{ wallet_address: wallet}]) + .select() + .single(); + return {data, error} }; -const getUserByWallet = async(email)=>{ +const getUserByWallet = async(wallet)=>{ const { data: user, error } = await supabase .from("users") .select("*") - .eq("email", email) + .eq("wallet_address", wallet) .single(); // gets a single row return {user, error} } diff --git a/backend/routes/authRoutes.js b/backend/routes/authRoutes.js index 03ca4d0..1ddb10e 100644 --- a/backend/routes/authRoutes.js +++ b/backend/routes/authRoutes.js @@ -1,59 +1,14 @@ const router = require('express').Router() const validate = require('../middlewares/validate') const {loginSchema, refreshShema, verifyEnsSchema} = require('../validators/authSchema') -const {loginController} = require('../controllers/authControllers') +const {loginController,refreshController,verifyEnsController} = require('../controllers/authControllers') -router.post('/auth/login',validate(loginSchema),loginController) +router.post('/login',validate(loginSchema),loginController) -// router.post('/auth/refresh',loginController,) +router.post('/refresh',refreshController) -// router.post('/auth/verify-ens',loginController,) +router.post('/verify-ens',verifyEnsController) module.exports = router -// OST /auth/login -// Wallet-based authentication - -// Request: -// { -// "wallet_address": "0x...", -// "signature": "0x...", -// "message": "Login to ENGIConnect" -// } - -// Response: -// { -// "access_token": "jwt_token", -// "refresh_token": "jwt_token", -// "user": { ... }, -// "expires_in": 3600 -// } -// POST /auth/refresh -// Refresh access token - -// Request: -// { -// "refresh_token": "jwt_token" -// } - -// Response: -// { -// "access_token": "jwt_token", -// "expires_in": 3600 -// } -// POST /auth/verify-ens -// Verify ENS domain ownership - -// Request: -// { -// "domain": "alice.ens", -// "signature": "0x..." -// } - -// Response: -// { -// "verified": true, -// "address": "0x..." -// } -// // User Management Endpoint \ No newline at end of file From b93494b65a6b456bba837b1eb14265abb9516406 Mon Sep 17 00:00:00 2001 From: Joseph Kingsley Date: Wed, 24 Sep 2025 23:29:58 +0100 Subject: [PATCH 4/5] refactor: changed jwt token secrets to auth controllers --- backend/controllers/authControllers.js | 16 +++++---- backend/middlewares/authGuard.js | 3 ++ backend/models/userModel.js | 50 +++++++++++++++++++++++++- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/backend/controllers/authControllers.js b/backend/controllers/authControllers.js index bb05e56..fd1f97a 100644 --- a/backend/controllers/authControllers.js +++ b/backend/controllers/authControllers.js @@ -29,13 +29,15 @@ const loginController = async (req, res, next) => { return res.status(401).json({error: "Signature does not match wallet"}); } - const access_token = jwt.sign({wallet_address}, process.env.JWT_SECRET, { + const access_token = jwt.sign({wallet_address, sub: user.id, permissions: ["read", "write", "admin"]}, process.env.JWT_SECRET, { expiresIn: "1h", }); - const refresh_token = jwt.sign({wallet_address}, process.env.JWT_SECRET, { + const refresh_token = jwt.sign({wallet_address, sub: user.id, permissions: ["read", "write", "admin"]}, process.env.JWT_SECRET, { expiresIn: "7d", }); + { + } return res.status(200).json({ message: "Login successful", @@ -63,8 +65,13 @@ const refreshController = async (req, res, next) => { // Verify refresh token const decoded = jwt.verify(refresh_token, process.env.JWT_SECRET); + const {user, error} = await getUserByWallet(decoded.wallet_address); + + if (error) { + return res.status(400).json({NOT_FOUND: "user does not exist"}); + } // Issue a new access token - const newAccessToken = jwt.sign({wallet: decoded.wallet}, process.env.JWT_SECRET, {expiresIn: "1h"}); + const newAccessToken = jwt.sign({wallet: decoded.wallet_address, sub: user.id, permissions: ["read", "write", "admin"]}, process.env.JWT_SECRET, {expiresIn: "1h"}); return res.status(200).json({ access_token: newAccessToken, @@ -95,9 +102,6 @@ const verifyEnsController = async (req, res, next) => { // 2. Recover address from signature const recovered = ethers.verifyMessage(message, signature); - console.log("ENS domain:", domain); - console.log("Resolved address:", resolvedAddress); - console.log("Recovered signer:", recovered); if (recovered.toLowerCase() !== resolvedAddress.toLowerCase()) { return res.status(401).json({error: "Signature does not match ENS owner"}); diff --git a/backend/middlewares/authGuard.js b/backend/middlewares/authGuard.js index ee61640..0d69ed7 100644 --- a/backend/middlewares/authGuard.js +++ b/backend/middlewares/authGuard.js @@ -24,3 +24,6 @@ const authMiddleware = (req, res, next) => { return res.status(401).json({ error: "Invalid or expired token" }); } }; + + +module.exports = {authMiddleware} \ No newline at end of file diff --git a/backend/models/userModel.js b/backend/models/userModel.js index 32f1351..b6eafab 100644 --- a/backend/models/userModel.js +++ b/backend/models/userModel.js @@ -22,4 +22,52 @@ const getUserByWallet = async(wallet)=>{ return {user, error} } -module.exports = { createUser, getAllUsers,getUserByWallet} \ No newline at end of file +module.exports = { createUser, getAllUsers,getUserByWallet} + +// User Management Endpoints +// GET /users/profile +// Get current user profile + +// Response: +// { +// "id": "uuid", +// "username": "alice_dev", +// "display_name": "Alice Johnson", +// "wallet_address": "0x...", +// "ens_domain": "alice.ens", +// "avatar_url": "ipfs://...", +// "bio": "Web3 Developer", +// "is_verified": true, +// "privacy_settings": { ... }, +// "stats": { +// "communities_joined": 5, +// "messages_sent": 1234, +// "achievements_count": 8 +// } +// } +// PUT /users/profile +// Update user profile + +// Request: +// { +// "display_name": "Alice Johnson", +// "bio": "Updated bio", +// "privacy_settings": { +// "profile_visibility": "public", +// "show_online_status": true +// } +// } +// GET /users/search +// Search users + +// Query Params: +// - q: search query +// - limit: 20 +// - offset: 0 + +// Response: +// { +// "users": [ ... ], +// "total": 150, +// "has_more": true +// } \ No newline at end of file From d1078834fad3cd6ebb7f9ba532a7158d4b0e6831 Mon Sep 17 00:00:00 2001 From: Joseph Kingsley Date: Thu, 25 Sep 2025 03:30:41 +0100 Subject: [PATCH 5/5] feat: implemented users api --- backend/controllers/authControllers.js | 3 +- backend/controllers/usersControllers.js | 85 +++++++++++++++++++++++++ backend/middlewares/authGuard.js | 43 ++++++------- backend/middlewares/validate.js | 42 ++++++------ backend/models/userModel.js | 74 +++++++++------------ backend/routes/index.js | 4 +- backend/routes/usersRoutes.js | 16 +++++ backend/validators/updateSchema.js | 25 ++++++++ 8 files changed, 203 insertions(+), 89 deletions(-) create mode 100644 backend/controllers/usersControllers.js create mode 100644 backend/routes/usersRoutes.js create mode 100644 backend/validators/updateSchema.js diff --git a/backend/controllers/authControllers.js b/backend/controllers/authControllers.js index fd1f97a..c5c12de 100644 --- a/backend/controllers/authControllers.js +++ b/backend/controllers/authControllers.js @@ -66,7 +66,7 @@ const refreshController = async (req, res, next) => { const decoded = jwt.verify(refresh_token, process.env.JWT_SECRET); const {user, error} = await getUserByWallet(decoded.wallet_address); - + if (error) { return res.status(400).json({NOT_FOUND: "user does not exist"}); } @@ -102,7 +102,6 @@ const verifyEnsController = async (req, res, next) => { // 2. Recover address from signature const recovered = ethers.verifyMessage(message, signature); - if (recovered.toLowerCase() !== resolvedAddress.toLowerCase()) { return res.status(401).json({error: "Signature does not match ENS owner"}); } diff --git a/backend/controllers/usersControllers.js b/backend/controllers/usersControllers.js new file mode 100644 index 0000000..9f2b5cb --- /dev/null +++ b/backend/controllers/usersControllers.js @@ -0,0 +1,85 @@ +const {getUserByWallet, updateUser, searchUsers} = require("../models/userModel"); + +const getProfileController = async (req, res, next) => { + try { + const {wallet_address} = req.user; + if (!wallet_address) return res.status(400).json({message: "Wallet address missing in request"}); + + const {user, error} = await getUserByWallet(wallet_address); + + if (error) { + return res.status(500).json({message: "Database error", error}); + } + + user + ? res.status(200).json({ + message: "User Data", + data: { + ...user, + }, + }) + : res.status(404).json({message: "User not found"}); + } catch (err) { + console.log(err); + next(err); + } +}; + +const searchUsersController = async (req, res, next) => { + const limit = +req.query.limit || 10; + const q = req.query.q; + if (!q) return res.status(400).json({message: "Search term is required"}); + + try { + const {wallet_address} = req.user; + if (!wallet_address) return res.status(400).json({message: "Wallet address missing in request"}); + + const {data, error} = await searchUsers(q, limit); + + if (error) { + return res.status(500).json({message: "Database error", error}); + } + const hasMore = data.length > limit; + + // Trim the extra item if it existed + const users = hasMore ? data.slice(0, limit) : data; + data + ? res.status(200).json({ + message: "User Data", + data: { + data: users, + total: users.length, + has_more: hasMore, + }, + }) + : res.status(404).json({message: "User not found"}); + } catch (err) { + console.log(err); + next(err); + } +}; + +const updateUserController = async (req, res, next) => { + try { + const {wallet_address} = req.user; + if (!wallet_address) return res.status(400).json({message: "Wallet address missing in request"}); + + const {data, error} = await updateUser(wallet_address, req.body); + + if (error) { + return res.status(500).json({message: "Database error", error: error.message}); + } + + data + ? res.status(201).json({ + message: "User Data", + data, + }) + : res.status(404).json({message: "User not found"}); + } catch (err) { + console.log(err); + next(err); + } +}; + +module.exports = {getProfileController, updateUserController, searchUsersController}; diff --git a/backend/middlewares/authGuard.js b/backend/middlewares/authGuard.js index 0d69ed7..c45e044 100644 --- a/backend/middlewares/authGuard.js +++ b/backend/middlewares/authGuard.js @@ -1,29 +1,26 @@ const jwt = require("jsonwebtoken"); const authMiddleware = (req, res, next) => { - - let token; - const authHeader = req.headers.authorization; + let token; + const authHeader = req.headers.authorization; + if (authHeader && authHeader.startsWith("Bearer ")) { + token = authHeader.split(" ")[1]; + } else if (req.body.token) { + // Fallback: read from body + token = req.body.token; + } + if (!token) { + return res.status(401).json({error: "Token missing"}); + } - if (authHeader && authHeader.startsWith("Bearer ")) { - token = authHeader.split(" ")[1]; - } else if (req.body.token) { - // Fallback: read from body - token = req.body.token; - } - - if (!token) { - return res.status(401).json({ error: "Token missing" }); - } - - try { - const decoded = jwt.verify(token, process.env.JWT_SECRET); - req.user = decoded; - next(); - } catch (err) { - return res.status(401).json({ error: "Invalid or expired token" }); - } + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + req.user = decoded; + next(); + } catch (err) { + console.log(err); + return res.status(401).json({error: "Invalid or expired token"}); + } }; - -module.exports = {authMiddleware} \ No newline at end of file +module.exports = authMiddleware; diff --git a/backend/middlewares/validate.js b/backend/middlewares/validate.js index ff7ac00..5ad3ea4 100644 --- a/backend/middlewares/validate.js +++ b/backend/middlewares/validate.js @@ -1,21 +1,27 @@ -const validate = (Schema)=>async(req,res,next)=>{ +const validate = (Schema) => async (req, res, next) => { + try { + const result = Schema.safeParse(req.body); + if (!result.success) { + const issue = result.error.issues[0]; - try { - const result = Schema.safeParse(req.body); - if (!result.success) { - - return res.status(400).json({ - message:'Validation failed', - errors: result.error.flatten().fieldErrors, - }) - } + let errorMessage; + if (issue.code === "unrecognized_keys") { + errorMessage = `${issue.keys[0]} is not allowed`; + } else { + errorMessage = issue.message; + } + return res.status(422).json({ + message: "Validation failed", + error: errorMessage, + }); + } - req.validated = result.data - next() - } catch (error) { - console.log(error); - return res.status(400).json({message:'Invalid request', error}) - } -} + req.validated = result.data; + next(); + } catch (error) { + console.log(error); + return res.status(400).json({message: "Invalid request", error}); + } +}; -module.exports = validate \ No newline at end of file +module.exports = validate; diff --git a/backend/models/userModel.js b/backend/models/userModel.js index b6eafab..77fc34d 100644 --- a/backend/models/userModel.js +++ b/backend/models/userModel.js @@ -13,6 +13,7 @@ const createUser = async (wallet) => { .single(); return {data, error} }; + const getUserByWallet = async(wallet)=>{ const { data: user, error } = await supabase .from("users") @@ -21,53 +22,36 @@ const getUserByWallet = async(wallet)=>{ .single(); // gets a single row return {user, error} } - -module.exports = { createUser, getAllUsers,getUserByWallet} -// User Management Endpoints -// GET /users/profile -// Get current user profile +const updateUser = async(wallet,updates)=>{ + const { data, error } = await supabase + .from("users") + .update(updates) + .eq("wallet_address", wallet) + .select() + .single(); // return one row + + return { data, error }; +} -// Response: -// { -// "id": "uuid", -// "username": "alice_dev", -// "display_name": "Alice Johnson", -// "wallet_address": "0x...", -// "ens_domain": "alice.ens", -// "avatar_url": "ipfs://...", -// "bio": "Web3 Developer", -// "is_verified": true, -// "privacy_settings": { ... }, -// "stats": { -// "communities_joined": 5, -// "messages_sent": 1234, -// "achievements_count": 8 -// } -// } -// PUT /users/profile -// Update user profile +const getUsersByPagination = async(page,pagesize = 10)=>{ + const { data, error } = await supabase + .from("users") + .select("*") + .range((page - 1) * pageSize, page * pageSize - 1); + return { data, error }; +} + + +const searchUsers = async(search,limit)=>{ + const { data, error } = await supabase + .from("users") + .select("*") + .or(`username.ilike.%${search}%,display_name.ilike.%${search}%`).limit(limit + 1); + return { data, error }; +} + +module.exports = { createUser, getAllUsers,getUserByWallet,updateUser,getUsersByPagination,searchUsers} -// Request: -// { -// "display_name": "Alice Johnson", -// "bio": "Updated bio", -// "privacy_settings": { -// "profile_visibility": "public", -// "show_online_status": true -// } -// } -// GET /users/search -// Search users -// Query Params: -// - q: search query -// - limit: 20 -// - offset: 0 -// Response: -// { -// "users": [ ... ], -// "total": 150, -// "has_more": true -// } \ No newline at end of file diff --git a/backend/routes/index.js b/backend/routes/index.js index 6656d9e..ac716a1 100644 --- a/backend/routes/index.js +++ b/backend/routes/index.js @@ -1,9 +1,11 @@ const router = require('express').Router() const authRoutes = require('./authRoutes') - +const userRoutes = require('./usersRoutes') router.use('/auth',authRoutes) +router.use('/user',userRoutes) + module.exports = router \ No newline at end of file diff --git a/backend/routes/usersRoutes.js b/backend/routes/usersRoutes.js new file mode 100644 index 0000000..ee3de7b --- /dev/null +++ b/backend/routes/usersRoutes.js @@ -0,0 +1,16 @@ +const router = require('express').Router() +const {getProfileController, updateUserController, searchUsersController} = require('../controllers/usersControllers') +const authMiddleware = require('../middlewares/authGuard') +const validate = require('../middlewares/validate') +const { updateUserSchema } = require('../validators/updateSchema') + + +router.get('/profile',authMiddleware,getProfileController) + +router.put('/profile',authMiddleware,validate(updateUserSchema),updateUserController) + +router.get('/search',authMiddleware,searchUsersController) + + +module.exports = router + diff --git a/backend/validators/updateSchema.js b/backend/validators/updateSchema.js new file mode 100644 index 0000000..50ecfe4 --- /dev/null +++ b/backend/validators/updateSchema.js @@ -0,0 +1,25 @@ +const {z} = require("zod"); + +const updateUserSchema = z.object({ + display_name: z.string().max(100, "Display name too long").optional(), + bio: z.string().optional(), + email: z.string().email().max(255, "Email too long").optional(), + username:z.string().min(3, "Username must be at least 3 characters") + .max(50, "Username too long").optional(), + avatar_url:z.string().url('Invalid url').optional(), + ens_domain:z.string().max(255).optional(), + unstoppable_domain:z.string().max(255).optional(), + is_verified:z.boolean().default(false).optional(), + privacy_settings: z + .object({ + profile_visibility: z + .enum(["public", "private"]) + .refine((val) => ["public", "private"].includes(val), {message: "profile_visibility must be of public or private"}) + .optional(), + show_online_status: z.boolean().optional(), + }).strict() + .optional(), + +}).strict(); + +module.exports = {updateUserSchema};