From 69ff8dd4c75b2ca9ed3f9cffa77f5b977f1666fc Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Sat, 3 Feb 2024 00:16:40 +0700 Subject: [PATCH] UBERF-5275: Fix collaborator editing (#4505) Signed-off-by: Andrey Sobolev --- server/collaborator/src/server.ts | 16 ++++++++-------- server/collaborator/src/storage/minio.ts | 2 +- server/collaborator/src/storage/mongodb.ts | 6 ++---- server/collaborator/src/storage/platform.ts | 6 ++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/server/collaborator/src/server.ts b/server/collaborator/src/server.ts index c1e7cc34f5..a2acfb942f 100644 --- a/server/collaborator/src/server.ts +++ b/server/collaborator/src/server.ts @@ -151,14 +151,14 @@ export async function start ( documentName = documentName.split('://', 2)[1] } - if (documentName.includes('/')) { - const [workspace] = documentName.split('/', 2) - if (workspace !== context.workspaceId.name) { - throw new Error('documentName must include workspace') - } - } else { - throw new Error('documentName must include workspace') - } + // if (documentName.includes('/')) { + // const [workspace] = documentName.split('/', 2) + // if (workspace !== context.workspaceId.name) { + // throw new Error('documentName must include workspace') + // } + // } else { + // throw new Error('documentName must include workspace') + // } return context }, diff --git a/server/collaborator/src/storage/minio.ts b/server/collaborator/src/storage/minio.ts index b00d879de1..ad18e60176 100644 --- a/server/collaborator/src/storage/minio.ts +++ b/server/collaborator/src/storage/minio.ts @@ -36,7 +36,7 @@ function parseDocumentId (documentId: string): MinioDocumentId { } function isValidDocumentId (documentId: MinioDocumentId, context: Context): boolean { - return documentId.minioDocumentId !== '' && documentId.workspace === context.workspaceId.name + return documentId.minioDocumentId !== '' // && documentId.workspace === context.workspaceId.name } function maybePlatformDocumentId (documentId: string): boolean { diff --git a/server/collaborator/src/storage/mongodb.ts b/server/collaborator/src/storage/mongodb.ts index 71cdb35172..d9435f9a9d 100644 --- a/server/collaborator/src/storage/mongodb.ts +++ b/server/collaborator/src/storage/mongodb.ts @@ -41,10 +41,8 @@ function parseDocumentId (documentId: string): MongodbDocumentId { function isValidDocumentId (documentId: MongodbDocumentId, context: Context): boolean { return ( - documentId.objectDomain !== '' && - documentId.objectId !== '' && - documentId.objectAttr !== '' && - documentId.workspace === context.workspaceId.name + documentId.objectDomain !== '' && documentId.objectId !== '' && documentId.objectAttr !== '' + // && documentId.workspace === context.workspaceId.name ) } diff --git a/server/collaborator/src/storage/platform.ts b/server/collaborator/src/storage/platform.ts index 32c7b9fa68..e7b5a4cbf4 100644 --- a/server/collaborator/src/storage/platform.ts +++ b/server/collaborator/src/storage/platform.ts @@ -40,10 +40,8 @@ function parseDocumentId (documentId: string): PlatformDocumentId { function isValidDocumentId (documentId: PlatformDocumentId, context: Context): boolean { return ( - documentId.objectClass !== '' && - documentId.objectId !== '' && - documentId.objectAttr !== '' && - documentId.workspace === context.workspaceId.name + documentId.objectClass !== '' && documentId.objectId !== '' && documentId.objectAttr !== '' // && + // documentId.workspace === context.workspaceId.name ) }