build(deps): bump mongoose version to 8.3.1

SciCatProject · Apr 15, 2024 · d13baa5 · d13baa5
1 parent 3b4757c
commit d13baa5
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "luxon": "^3.2.1",
     "mathjs": "^12.0.0",
     "migrate-mongo": "^11.0.0",
-    "mongoose": "^8.0.4",
+    "mongoose": "^8.3.1",
     "node-fetch": "^3.3.0",
     "nodemailer": "^6.7.8",
     "openid-client": "^5.1.8",

diff --git a/src/auth/strategies/ldap.strategy.ts b/src/auth/strategies/ldap.strategy.ts
@@ -30,7 +30,7 @@ export class LdapStrategy extends PassportStrategy(Strategy, "ldap") {
     const userFilter: FilterQuery<UserDocument> = {
       $or: [
         { username: `ldap.${payload.displayName}` },
-        { username: payload.displayName },
+        { username: payload.displayName as string },
         { email: payload.mail as string },
       ],
     };

diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -467,22 +467,42 @@ export const createFullqueryFilter = <T>(
       };
     } else if (key === "userGroups") {
       filterQuery["$or"]?.push({
-        ownerGroup: searchExpression<T>(model, "ownerGroup", fields[key]),
+        ownerGroup: searchExpression<T>(
+          model,
+          "ownerGroup",
+          fields[key],
+        ) as object,
       });
       filterQuery["$or"]?.push({
-        accessGroups: searchExpression<T>(model, "accessGroups", fields[key]),
+        accessGroups: searchExpression<T>(
+          model,
+          "accessGroups",
+          fields[key],
+        ) as object,
       });
     } else if (key === "ownerGroup") {
       filterQuery["$or"]?.push({
-        ownerGroup: searchExpression<T>(model, "ownerGroup", fields[key]),
+        ownerGroup: searchExpression<T>(
+          model,
+          "ownerGroup",
+          fields[key],
+        ) as object,
       });
     } else if (key === "accessGroups") {
       filterQuery["$or"]?.push({
-        accessGroups: searchExpression<T>(model, "accessGroups", fields[key]),
+        accessGroups: searchExpression<T>(
+          model,
+          "accessGroups",
+          fields[key],
+        ) as object,
       });
     } else if (key === "sharedWith") {
       filterQuery["$or"]?.push({
-        sharedWith: searchExpression<T>(model, "sharedWith", fields[key]),
+        sharedWith: searchExpression<T>(
+          model,
+          "sharedWith",
+          fields[key],
+        ) as object,
       });
     } else {
       filterQuery[key as keyof FilterQuery<T>] = searchExpression<T>(
@@ -890,7 +910,7 @@ export const replaceLikeOperator = <T>(filter: IFilters<T>): IFilters<T> => {
   if (filter.where) {
     filter.where = replaceLikeOperatorRecursive(
       filter.where as Record<string, unknown>,
-    );
+    ) as object;
   }
   return filter;
 };

diff --git a/src/origdatablocks/origdatablocks.controller.ts b/src/origdatablocks/origdatablocks.controller.ts
@@ -319,7 +319,15 @@ export class OrigDatablocksController {
         parsedFilters.where.userGroups = parsedFilters.where.userGroups ?? [];
         parsedFilters.where.userGroups.push(...user.currentGroups);
       } else if (canViewOwner) {
-        parsedFilters.where.ownerGroup = parsedFilters.where.ownerGroup ?? [];
+        if (!parsedFilters.where.ownerGroup) {
+          parsedFilters.where.ownerGroup = [];
+        }
+
+        parsedFilters.where.ownerGroup = Array.isArray(
+          parsedFilters.where.ownerGroup,
+        )
+          ? parsedFilters.where.ownerGroup
+          : [parsedFilters.where.ownerGroup as string];
         parsedFilters.where.ownerGroup.push(...user.currentGroups);
       }
     }