From c0182cff5113204d2ab60e7784f84ca907c01cad Mon Sep 17 00:00:00 2001 From: Eric Doughty-Papassideris Date: Thu, 19 Sep 2024 03:14:49 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20oo-connector:=20respect=20user?= =?UTF-8?q?=20picked=20by=20OO=20for=20callback=20url=20in=20updateSession?= =?UTF-8?q?=20(#525)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orm/connectors/postgres/postgres-query-builder.ts | 2 +- .../src/controllers/onlyoffice.controller.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts b/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts index 441ff0b0..a223035e 100644 --- a/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts +++ b/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts @@ -47,7 +47,7 @@ export class PostgresQueryBuilder { values.push(...inClause); } } else { - const isANotEqualFilter = filter && Object.keys(filter).join("") === "$ne"; + const isANotEqualFilter = filter && Object.keys(filter).join("!") === "$ne"; if (filter === null || (isANotEqualFilter && filter["$ne"] === null)) { whereClause += `${key} IS${filter === null ? "" : " NOT"} NULL`; } else { diff --git a/tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts b/tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts index f472d34a..a5186f88 100644 --- a/tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts +++ b/tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts @@ -71,7 +71,7 @@ class OnlyOfficeController { req.body, ); const officeTokenPayload = jwt.verify(token, CREDENTIALS_SECRET) as OfficeToken; - const { preview, /* company_id, file_id, user_id, drive_file_id, */ in_page_token /* editing_session_key */ } = officeTokenPayload; + const { preview, user_id, /* company_id, file_id, drive_file_id, */ in_page_token /* editing_session_key */ } = officeTokenPayload; // check token is an in_page_token and allow save if (!in_page_token) throw new Error('OO Callback invalid token, must be a in_page_token'); @@ -87,12 +87,12 @@ class OnlyOfficeController { case OnlyOffice.Callback.Status.BEING_EDITED_BUT_IS_SAVED: logger.info(`OO Callback force save for session ${key} for reason: ${OnlyOffice.Callback.ForceSaveTypeToString(req.body.forcesavetype)}`); - await driveService.addEditingSessionVersion(key, url); //, token); //TODO Fix user token (getting 401) + await driveService.addEditingSessionVersion(key, url, user_id); break; case OnlyOffice.Callback.Status.READY_FOR_SAVING: logger.info(`OO Callback new version for session ${key} created`); - await driveService.endEditing(key, url); //, token); //TODO Fix user token (getting 401) + await driveService.endEditing(key, url, user_id); break; case OnlyOffice.Callback.Status.CLOSED_WITHOUT_CHANGES: