upgrade major version of mongoose from v6 to v7

backend/package.json

@@ -30,7 +30,8 @@
     "jsrp": "^0.2.4",
     "libsodium-wrappers": "^0.7.10",
     "lodash": "^4.17.21",
-    "mongoose": "^6.10.5",
+    "mongodb": "^5.7.0",
+    "mongoose": "^7.4.1",
     "nanoid": "^3.3.6",
     "node-cache": "^5.1.2",
     "nodemailer": "^6.8.0",

backend/src/controllers/v1/webhookController.ts

@@ -72,7 +72,8 @@ export const deleteWebhook = async (req: Request, res: Response) => {
     workspaceId: webhook.workspace,
     acceptedRoles: [ADMIN, MEMBER]
   });
-  await webhook.remove();
+
+  await webhook.deleteOne();
 
   return res.status(200).send({
     message: "successfully removed webhook"

backend/src/controllers/v2/secretController.ts

@@ -309,16 +309,16 @@ export const updateSecret = async (req: Request, res: Response) => {
     { _id: secretModificationsRequested._id, workspace: workspaceId },
     { $inc: { version: 1 }, $set: sanitizedSecret }
   )
-  .catch((error) => {
+    .catch((error) => {
-    if (error instanceof ValidationError) {
+      if (error instanceof ValidationError) {
-      throw RouteValidationError({
+        throw RouteValidationError({
-        message: "Unable to apply modifications, please try again",
+          message: "Unable to apply modifications, please try again",
-        stack: error.stack
+          stack: error.stack
-      });
+        });
-    }
+      }
 
-    throw error;
+      throw error;
-  });
+    });
 
   if (postHogClient) {
     postHogClient.capture({
@@ -370,12 +370,12 @@ export const getSecrets = async (req: Request, res: Response) => {
     $or: [{ user: userId }, { user: { $exists: false } }],
     type: { $in: [SECRET_SHARED, SECRET_PERSONAL] }
   })
-  .catch((err) => {
+    .catch((err) => {
-    throw RouteValidationError({
+      throw RouteValidationError({
-      message: "Failed to get secrets, please try again",
+        message: "Failed to get secrets, please try again",
-      stack: err.stack
+        stack: err.stack
-    });
+      });
-  })
+    })
 
   if (postHogClient) {
     postHogClient.capture({

backend/src/controllers/v2/serviceAccountsController.ts

@@ -83,7 +83,7 @@ export const createServiceAccount = async (req: Request, res: Response) => {
         lastUsed: new Date(),
         expiresAt,
         secretHash,
-    }).save();
+    }).save()
 
     const serviceAccountObj = serviceAccount.toObject();
 

backend/src/helpers/auth.ts

@@ -151,7 +151,7 @@ export const getAuthSTDPayload = async ({
 	const [_, TOKEN_IDENTIFIER, TOKEN_SECRET] = <[string, string, string]>authTokenValue.split(".", 3);
 
 	let serviceTokenData = await ServiceTokenData
-		.findById(TOKEN_IDENTIFIER, "+secretHash +expiresAt");
+		.findById(TOKEN_IDENTIFIER, "+secretHash +expiresAt").lean();
 
 	if (!serviceTokenData) {
 		throw ServiceTokenDataNotFoundError({ message: "Failed to find service token data" });
@@ -176,7 +176,7 @@ export const getAuthSTDPayload = async ({
 		}, {
 			new: true,
 		})
-		.select("+encryptedKey +iv +tag");
+		.select("+encryptedKey +iv +tag").lean();
 
 	if (!serviceTokenData) throw ServiceTokenDataNotFoundError({ message: "Failed to find service token data" });
 

backend/src/helpers/secret.ts

@@ -109,9 +109,9 @@ export const v1PushSecrets = async ({
     if (`${s.type}-${s.secretKeyHash}` in newSecretsObj) {
       if (
         s.secretValueHash !==
-          newSecretsObj[`${s.type}-${s.secretKeyHash}`].hashValue ||
+        newSecretsObj[`${s.type}-${s.secretKeyHash}`].hashValue ||
         s.secretCommentHash !==
-          newSecretsObj[`${s.type}-${s.secretKeyHash}`].hashComment
+        newSecretsObj[`${s.type}-${s.secretKeyHash}`].hashComment
       ) {
         // case: filter secrets where value or comment changed
         return true;
@@ -371,9 +371,9 @@ export const v2PushSecrets = async ({
     if (`${s.type}-${s.secretKeyHash}` in newSecretsObj) {
       if (
         s.secretValueHash !==
-          newSecretsObj[`${s.type}-${s.secretKeyHash}`].secretValueHash ||
+        newSecretsObj[`${s.type}-${s.secretKeyHash}`].secretValueHash ||
         s.secretCommentHash !==
-          newSecretsObj[`${s.type}-${s.secretKeyHash}`].secretCommentHash
+        newSecretsObj[`${s.type}-${s.secretKeyHash}`].secretCommentHash
       ) {
         // case: filter secrets where value or comment changed
         return true;
@@ -484,7 +484,7 @@ export const v2PushSecrets = async ({
 
     // (EE) add secret versions for new secrets
     EESecretService.addSecretVersions({
-      secretVersions: newSecrets.map((secretDocument: ISecret) => {
+      secretVersions: newSecrets.map((secretDocument) => {
         return new SecretVersion({
           ...secretDocument,
           secret: secretDocument._id,

backend/src/utils/setup/backfillData.ts

@@ -490,7 +490,7 @@ export const backfillSecretFolders = async () => {
       });
 
       await SecretSnapshot.insertMany(newSnapshots);
-      await secSnapshot.delete();
+      await secSnapshot.deleteOne();
     }
 
     secretSnapshots = await SecretSnapshot.find({