eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🩹 oo-connector: respect user picked by OO for callback url in updateSession (#525)

Browse Source
This commit is contained in:
Eric Doughty-Papassideris
2024-09-19 03:14:49 +02:00
parent b6d66d62b5
commit c0182cff51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts
+1 -1
View File
@@ -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 {
tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts
+3 -3
View File
@@ -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: