[mirotalkwebrtc] - improvements

miroslavpejic85 · Oct 5, 2024 · 092ff1c · 092ff1c
1 parent 139cbc9
commit 092ff1c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/backend/api/swagger.yaml b/backend/api/swagger.yaml
@@ -390,6 +390,9 @@ components:
                 email:
                     type: string
                     example: '[email protected]'
+                username:
+                    type: string
+                    example: 'Miroslav Pejic'
                 password:
                     type: string
                     example: 'Test@123'

diff --git a/backend/controllers/users.js b/backend/controllers/users.js
@@ -76,7 +76,13 @@ async function userLogin(req, res) {
         const payload = { username: username, email: email, password: password };
         const token = utils.tokenEncode(payload);
 
-        const userFindOne = await User.findOne({ email: email });
+        //const userFindOne = await User.findOne({ email: email });
+        const userFindOne = await User.findOne({
+            $or: [
+                { email: email },
+                { username: username }
+            ]
+        });
 
         if (!Object.is(userFindOne, null) && userFindOne.active) {
             log.debug('User found, but we going to check if the provided password exists');
@@ -187,10 +193,15 @@ async function userIsAuth(req, res) {
     try {
         log.debug('userIsAuth query', req.body);
 
-        const { email, password } = req.body;
+        const { email, username, password } = req.body;
 
-        // Check by email as uuid and indexed
-        const userFindOne = await User.findOne({ email: email });
+        // Check by email (uuid) or username as indexed
+        const userFindOne = await User.findOne({
+            $or: [
+                { email: email },
+                { username: username ? username : email }
+            ]
+        });
 
         if (Object.is(userFindOne, null) || !userFindOne.active) {
             log.debug('user not found!', email);

diff --git a/backend/models/users.js b/backend/models/users.js
@@ -6,7 +6,7 @@ const userSchema = new mongoose.Schema({
     role: { type: String, default: 'guest' },
     allow: { type: Array, default: ['ALL'] },
     email: { type: String, index: { unique: true } },
-    username: { type: String },
+    username: { type: String, index: { unique: false } },
     password: { type: String },
     token: { type: String },
     active: { type: Boolean, enum: [true, false], default: false },

diff --git a/frontend/js/client.js b/frontend/js/client.js
@@ -9,7 +9,7 @@
  * @license For private project or commercial purposes contact us at: [email protected] or purchase it directly via Code Canyon:
  * @license https://codecanyon.net/item/a-selfhosted-mirotalks-webrtc-rooms-scheduler-server/42643313
  * @author  Miroslav Pejic - [email protected]
- * @version 1.0.93
+ * @version 1,0,94
  */
 
 const isMobile = !!/Android|webOS|iPhone|iPad|iPod|BB10|BlackBerry|IEMobile|Opera Mini|Mobile|mobile/i.test(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalkwebrtc",
-    "version": "1.0.93",
+    "version": "1,0,94",
     "description": "MiroTalk WebRTC admin",
     "main": "server.js",
     "scripts": {
@@ -33,7 +33,7 @@
     "license": "AGPL-3.0",
     "homepage": "https://github.com/miroslavpejic85/mirotalkwebrtc",
     "dependencies": {
-        "@sentry/node": "^8.31.0",
+        "@sentry/node": "^8.33.1",
         "axios": "^1.7.7",
         "bcryptjs": "^2.4.3",
         "colors": "1.4.0",
@@ -44,11 +44,11 @@
         "express": "^4.21.0",
         "jsonwebtoken": "^9.0.2",
         "js-yaml": "^4.1.0",
-        "mongoose": "^8.6.3",
+        "mongoose": "^8.7.0",
         "ngrok": "^5.0.0-beta.2",
         "nodemailer": "^6.9.15",
         "swagger-ui-express": "^5.0.1",
-        "twilio": "^5.3.1"
+        "twilio": "^5.3.3"
     },
     "devDependencies": {
         "nodemon": "^3.1.7",