浏览代码

fix: missing var reference and brackets (#675)

Mo 1 年之前
父节点
当前提交
053852b46c

+ 1 - 1
packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts

@@ -51,7 +51,7 @@ export class HomeServerItemsController extends BaseHttpController {
 
     let sharedVaultUuids: string[] | undefined = undefined
     if ('shared_vault_uuids' in request.body) {
-      const sharedVaultUuidsValidation = Validator.isNotEmpty(sharedVaultUuids)
+      const sharedVaultUuidsValidation = Validator.isNotEmpty(request.body.shared_vault_uuids)
       if (!sharedVaultUuidsValidation.isFailed()) {
         sharedVaultUuids = request.body.shared_vault_uuids
       }

+ 12 - 8
packages/syncing-server/src/Infra/TypeORM/TypeORMItemRepository.ts

@@ -1,5 +1,5 @@
 import { ReadStream } from 'fs'
-import { Repository, SelectQueryBuilder } from 'typeorm'
+import { Repository, SelectQueryBuilder, Brackets } from 'typeorm'
 import { Change, MapperInterface, Uuid } from '@standardnotes/domain-core'
 
 import { Item } from '../../Domain/Item/Item'
@@ -191,13 +191,17 @@ export class TypeORMItemRepository implements ItemRepositoryInterface {
           'sharedVaultAssociation',
           'sharedVaultAssociation.itemUuid = item.uuid',
         )
-        .where('sharedVaultAssociation.sharedVaultUuid IN (:...sharedVaultUuids)', {
-          sharedVaultUuids: query.includeSharedVaultUuids,
-        })
-
-      if (query.userUuid) {
-        queryBuilder.orWhere('item.user_uuid = :userUuid', { userUuid: query.userUuid })
-      }
+        .where(
+          new Brackets((qb) => {
+            qb.where('sharedVaultAssociation.sharedVaultUuid IN (:...sharedVaultUuids)', {
+              sharedVaultUuids: query.includeSharedVaultUuids,
+            })
+
+            if (query.userUuid) {
+              qb.orWhere('item.user_uuid = :userUuid', { userUuid: query.userUuid })
+            }
+          }),
+        )
     } else if (query.exclusiveSharedVaultUuids !== undefined && query.exclusiveSharedVaultUuids.length > 0) {
       queryBuilder
         .innerJoin(