Updates required for mongodb v4.8.

roncli · Jul 19, 2022 · bc13c8b · bc13c8b
1 parent 2e3c0bc
commit bc13c8b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 41 deletions.
diff --git a/node/src/database/session.js b/node/src/database/session.js
@@ -58,14 +58,10 @@ class SessionDb {
         await db.collection("session").findOneAndUpdate({_id: MongoDb.ObjectId.createFromHexString(session._id), ip: session.ip, userId: MongoDb.Long.fromNumber(session.userId)}, {$set: {
             ip: session.ip,
             userId: MongoDb.Long.fromNumber(session.userId),
-            accessToken: {
-                salt: new MongoDb.Binary(encryptedTokens.accessToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.accessToken.encrypted)
-            },
-            refreshToken: {
-                salt: new MongoDb.Binary(encryptedTokens.refreshToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.refreshToken.encrypted)
-            },
+            "accessToken.salt": new MongoDb.Binary(encryptedTokens.accessToken.salt),
+            "accessToken.encrypted": new MongoDb.Binary(encryptedTokens.accessToken.encrypted),
+            "refreshToken.salt": new MongoDb.Binary(encryptedTokens.refreshToken.salt),
+            "refreshToken.encrypted": new MongoDb.Binary(encryptedTokens.refreshToken.encrypted),
             expires: session.expires
         }});
     }

diff --git a/node/src/database/twitch.js b/node/src/database/twitch.js
@@ -90,22 +90,14 @@ class TwitchDb {
         };
 
         await db.collection("twitch").findOneAndUpdate({}, {$set: {
-            botAccessToken: {
-                salt: new MongoDb.Binary(encryptedTokens.botAccessToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.botAccessToken.encrypted)
-            },
-            botRefreshToken: {
-                salt: new MongoDb.Binary(encryptedTokens.botRefreshToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.botRefreshToken.encrypted)
-            },
-            channelAccessToken: {
-                salt: new MongoDb.Binary(encryptedTokens.channelAccessToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.channelAccessToken.encrypted)
-            },
-            channelRefreshToken: {
-                salt: new MongoDb.Binary(encryptedTokens.channelRefreshToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.channelRefreshToken.encrypted)
-            }
+            "botAccessToken.salt": new MongoDb.Binary(encryptedTokens.botAccessToken.salt),
+            "botAccessToken.encrypted": new MongoDb.Binary(encryptedTokens.botAccessToken.encrypted),
+            "botRefreshToken.salt": new MongoDb.Binary(encryptedTokens.botRefreshToken.salt),
+            "botRefreshToken.encrypted": new MongoDb.Binary(encryptedTokens.botRefreshToken.encrypted),
+            "channelAccessToken.salt": new MongoDb.Binary(encryptedTokens.channelAccessToken.salt),
+            "channelAccessToken.encrypted": new MongoDb.Binary(encryptedTokens.channelAccessToken.encrypted),
+            "channelRefreshToken.salt": new MongoDb.Binary(encryptedTokens.channelRefreshToken.salt),
+            "channelRefreshToken.encrypted": new MongoDb.Binary(encryptedTokens.channelRefreshToken.encrypted)
         }}, {upsert: true});
     }
 }

diff --git a/node/src/database/user.js b/node/src/database/user.js
@@ -338,15 +338,11 @@ class UserDb {
         let userResult;
         if (await db.collection("user").findOne({"discord.id": user.id})) {
             const result = await db.collection("user").findOneAndUpdate({"discord.id": user.id}, {$set: {
-                discord: {
-                    id: user.id,
-                    username: user.username,
-                    discriminator: user.discriminator
-                },
-                guildMember: {
-                    nick: guildMember.nickname,
-                    joinedAt: guildMember.joinedAt
-                },
+                "discord.id": user.id,
+                "discord.username": user.username,
+                "discord.discriminator": user.discriminator,
+                "guildMember.nick": guildMember.nickname,
+                "guildMember.joinedAt": guildMember.joinedAt,
                 connections: connections.filter((c) => c.verified && !c.revoked && c.visibility !== 0).map((c) => ({
                     name: c.name,
                     id: c.id,
@@ -391,14 +387,10 @@ class UserDb {
         const sessionResult = await db.collection("session").findOneAndUpdate({ip: req.ip, userId: userResult._id}, {$set: {
             ip: req.ip,
             userId: userResult._id,
-            accessToken: {
-                salt: new MongoDb.Binary(encryptedTokens.accessToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.accessToken.encrypted)
-            },
-            refreshToken: {
-                salt: new MongoDb.Binary(encryptedTokens.refreshToken.salt),
-                encrypted: new MongoDb.Binary(encryptedTokens.refreshToken.encrypted)
-            },
+            "accessToken.salt": new MongoDb.Binary(encryptedTokens.accessToken.salt),
+            "accessToken.encrypted": new MongoDb.Binary(encryptedTokens.accessToken.encrypted),
+            "refreshToken.salt": new MongoDb.Binary(encryptedTokens.refreshToken.salt),
+            "refreshToken.encrypted": new MongoDb.Binary(encryptedTokens.refreshToken.encrypted),
             expires
         }}, {upsert: true, returnDocument: "after"});