[mirotalkwebrtc] - fix typo

backend/middleware/url.js

@@ -1,19 +1,19 @@
 'use strict';
 
-const utils = require('../common/utils');
 const logs = require('../common/logs');
-
 const log = new logs('URL');
 
-const url = (err, req, res, next) => {
-    if (err instanceof URIError) {
-        log.error('Malformed URL', req.url);
-        res.status(400).send('Bad Request: Malformed URL');
-    } else {
+const url = (req, res, next) => {
+    try {
+        decodeURIComponent(req.path);
+        next();
+    } catch (err) {
+        if (err instanceof URIError) {
+            log.error('Malformed URL', req.url);
+            return res.status(400).json({ error: 'Bad Request: Malformed URL' });
+        }
         next(err);
     }
-
-    return next();
 };
 
 module.exports = url;

backend/routes/room.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const express = require('express');
-const url = require('../middleware/url');
 const api = require('../middleware/api');
 const auth = require('../middleware/auth');
 const admin = require('../middleware/admin');
@@ -10,42 +9,42 @@ const router = express.Router();
 const controllersRooms = require('../controllers/rooms');
 
 //CREATE: /api/v1/room
-router.post('/room', auth, validator, url, (req, res) => {
+router.post('/room', auth, validator, (req, res) => {
     controllersRooms.roomCreate(req, res);
 });
 
 //EXISTS: /api/v1/room/exists
-router.post('/room/exists', api, url, (req, res) => {
+router.post('/room/exists', api, (req, res) => {
     controllersRooms.roomExists(req, res);
 });
 
 //GET: /api/v1/room/findBy/userId
-router.get('/room/findBy/:userId', auth, url, (req, res) => {
+router.get('/room/findBy/:userId', auth, (req, res) => {
     controllersRooms.roomFindBy(req, res);
 });
 
 //DELETE: /api/v1/findBy/userId
-router.delete('/room/findBy/:userId', auth, url, (req, res) => {
+router.delete('/room/findBy/:userId', auth, (req, res) => {
     controllersRooms.roomDeleteFindBy(req, res);
 });
 
 //GET: /api/v1/room/id
-router.get('/room/:id', auth, url, (req, res) => {
+router.get('/room/:id', auth, (req, res) => {
     controllersRooms.roomGet(req, res);
 });
 
 //UPDATE: /api/v1/room/id
-router.patch('/room/:id', auth, validator, url, (req, res) => {
+router.patch('/room/:id', auth, validator, (req, res) => {
     controllersRooms.roomUpdate(req, res);
 });
 
 //DELETE: /api/v1/room/id
-router.delete('/room/:id', auth, url, (req, res) => {
+router.delete('/room/:id', auth, (req, res) => {
     controllersRooms.roomDelete(req, res);
 });
 
 //DELETE: /api/v1/room/deleteALL
-router.delete('/room/deleteAll', admin, url, (req, res) => {
+router.delete('/room/deleteAll', admin, (req, res) => {
     controllersRooms.roomDeleteALL(req, res);
 });
 

backend/routes/sms.js

@@ -2,13 +2,12 @@
 
 const express = require('express');
 const auth = require('../middleware/auth');
-const url = require('../middleware/url');
 //const admin = require('../middleware/admin');
 const router = express.Router();
 const controllersSmS = require('../controllers/sms');
 
 //POST: /api/v1/sms
-router.post('/sms', auth, url, (req, res) => {
+router.post('/sms', auth, (req, res) => {
     controllersSmS.smsSend(req, res);
 });
 

backend/routes/token.js

@@ -1,14 +1,13 @@
 'use strict';
 
 const express = require('express');
-const url = require('../middleware/url');
 const auth = require('../middleware/auth');
 const validator = require('../middleware/validator');
 const router = express.Router();
 const controllersToken = require('../controllers/token');
 
 //GET: /api/v1/token/SFU/:token
-router.get('/token/SFU/:token', auth, validator, url, (req, res) => {
+router.get('/token/SFU/:token', auth, validator, (req, res) => {
     controllersToken.tokenSFU(req, res);
 });
 

backend/routes/users.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const express = require('express');
-const url = require('../middleware/url');
 const auth = require('../middleware/auth');
 const admin = require('../middleware/admin');
 const api = require('../middleware/api');
@@ -10,52 +9,52 @@ const router = express.Router();
 const controllersUsers = require('../controllers/users');
 
 //CREATE: /api/v1/user
-router.post('/user', validator, url, (req, res) => {
+router.post('/user', validator, (req, res) => {
     controllersUsers.userCreate(req, res);
 });
 
 //LOGIN: /api/v1/user/login
-router.post('/user/login', validator, url, (req, res) => {
+router.post('/user/login', validator, (req, res) => {
     controllersUsers.userLogin(req, res);
 });
 
 //POST: /api/v1/user/isAuth/
-router.post('/user/isAuth', api, url, (req, res) => {
+router.post('/user/isAuth', api, (req, res) => {
     controllersUsers.userIsAuth(req, res);
 });
 
 //POST: /api/v1/user/isRoomAllowed/
-router.post('/user/isRoomAllowed', api, url, (req, res) => {
+router.post('/user/isRoomAllowed', api, (req, res) => {
     controllersUsers.userIsRoomAllowed(req, res);
 });
 
 //POST: /api/v1/user/allowedRooms/
-router.post('/user/roomsAllowed', api, url, (req, res) => {
+router.post('/user/roomsAllowed', api, (req, res) => {
     controllersUsers.userRoomsAllowed(req, res);
 });
 
 //GET: /api/v1/user/confirmation/?token=<token>
-router.get('/user/confirmation', auth, url, (req, res) => {
+router.get('/user/confirmation', auth, (req, res) => {
     controllersUsers.userConfirmation(req, res);
 });
 
 //GET: /api/v1/user/id
-router.get('/user/:id', auth, url, (req, res) => {
+router.get('/user/:id', auth, (req, res) => {
     controllersUsers.userGet(req, res);
 });
 
 //UPDATE: /api/v1/user/id
-router.patch('/user/:id', auth, validator, url, (req, res) => {
+router.patch('/user/:id', auth, validator, (req, res) => {
     controllersUsers.userUpdate(req, res);
 });
 
 //DELETE: /api/v1/user/id
-router.delete('/user/:id', auth, url, (req, res) => {
+router.delete('/user/:id', auth, (req, res) => {
     controllersUsers.userDelete(req, res);
 });
 
 //DELETE: /api/v1/user/deleteALL
-router.delete('/user/deleteALL', admin, url, (req, res) => {
+router.delete('/user/deleteALL', admin, (req, res) => {
     controllersUsers.userDeleteALL(req, res);
 });
 

backend/server.js

@@ -5,6 +5,7 @@ require('dotenv').config();
 const mongoose = require('mongoose');
 const express = require('express');
 const auth = require('./middleware/auth');
+const url = require('./middleware/url');
 const corsOptions = require('./config/cors');
 const cors = require('cors');
 const compression = require('compression');
@@ -61,7 +62,7 @@ mongoose
         app.use(express.json());
 
         // Logs requests
-        app.use((req, res, next) => {
+        app.use(url, (req, res, next) => {
             log.debug('New request:', {
                 headers: req.headers,
                 body: req.body,