fix(database): findOne() null query filters (#806)

* Revert "fix: missed null parsedQuery case (#805)" This reverts commit 21628e0. * fix(database): findOne() null query filters
ConduitPlatform · Nov 21, 2023 · 5ba4e74 · 5ba4e74
1 parent 21628e0
commit 5ba4e74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts b/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
@@ -305,15 +305,17 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
       populate?: string[];
     },
   ): Promise<any> {
-    let parsedQuery: Indexable | null = parseQuery(this.parseStringToQuery(query));
-    parsedQuery = await this.getAuthorizedQuery(
+    const parsedQuery: Indexable | null = parseQuery(this.parseStringToQuery(query));
+    const filter = await this.getAuthorizedQuery(
       'read',
       parsedQuery,
       false,
       options?.userId,
       options?.scope,
     );
-    if (isNil(parsedQuery)) return null;
+    if (isNil(filter) && !isNil(parsedQuery)) {
+      return null;
+    }
     let finalQuery = this.model.findOne(parsedQuery!, options?.select);
     if (options?.populate !== undefined && options?.populate !== null) {
       finalQuery = this.populate(finalQuery, options?.populate);

diff --git a/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts b/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts
@@ -339,7 +339,7 @@ export class SequelizeSchema extends SchemaAdapter<ModelStatic<any>> {
       options?.userId,
       options?.scope,
     );
-    if (isNil(filter)) {
+    if (isNil(filter) && !isNil(query)) {
       return null;
     }
     const { filter: parsedFilter, parsingResult } = parseQueryFilter(