From 8377997f861100ac28f7ac14e3165a2e4b1bdebd Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Sat, 13 Apr 2024 22:14:34 +0200 Subject: [PATCH] [mirotalk] - Fix HOST_PROTECTED mode, update dep --- app/src/server.js | 12 ++++-------- package.json | 6 +++--- public/js/client.js | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/server.js b/app/src/server.js index a81cadf2..688bc019 100755 --- a/app/src/server.js +++ b/app/src/server.js @@ -39,7 +39,7 @@ dependencies: { * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.3.16 + * @version 1.3.17 * */ @@ -365,7 +365,7 @@ app.use((err, req, res, next) => { // main page app.get(['/'], (req, res) => { - if (hostCfg.protected) { + if (hostCfg.protected && !hostCfg.authenticated) { const ip = getIP(req); if (allowedIP(ip)) { res.sendFile(views.landing); @@ -380,7 +380,7 @@ app.get(['/'], (req, res) => { // set new room name and join app.get(['/newcall'], (req, res) => { - if (hostCfg.protected) { + if (hostCfg.protected && !hostCfg.authenticated) { const ip = getIP(req); if (allowedIP(ip)) { res.sendFile(views.newCall); @@ -417,7 +417,7 @@ app.get(['/test'], (req, res) => { res.sendFile(views.stunTurn); }); -// no room name specified to join +// Handle Direct join room with params app.get('/join/', (req, res) => { if (Object.keys(req.query).length > 0) { log.debug('Request Query', req.query); @@ -470,10 +470,6 @@ app.get('/join/', (req, res) => { return res.sendFile(views.login); } } - if (hostCfg.protected) { - return res.sendFile(views.login); - } - res.redirect('/'); }); // Join Room by id diff --git a/package.json b/package.json index 6cd7027a..ddcf5a52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mirotalk", - "version": "1.3.16", + "version": "1.3.17", "description": "A free WebRTC browser-based video call", "main": "server.js", "scripts": { @@ -49,8 +49,8 @@ "express": "^4.19.2", "jsonwebtoken": "^9.0.2", "ngrok": "^5.0.0-beta.2", - "openai": "^4.33.0", - "qs": "^6.12.0", + "openai": "^4.33.1", + "qs": "^6.12.1", "socket.io": "^4.7.5", "swagger-ui-express": "^5.0.0", "uuid": "9.0.1", diff --git a/public/js/client.js b/public/js/client.js index af0661b5..1bde53ed 100644 --- a/public/js/client.js +++ b/public/js/client.js @@ -15,7 +15,7 @@ * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.3.16 + * @version 1.3.17 * */