pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[prettier] auto-fix

Browse Source
This commit is contained in:
Sergey Konovalov
2025-08-31 02:48:29 +03:00
parent ec42121623
commit 7f44d0d321
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.husky/pre-commit
View File

@ -0,0 +1 @@
npx lint-staged

4
Common/sources/logger.js
View File

@ -66,11 +66,11 @@ log4js.addLayout('json', () => {
* @param {object} cfg
* @returns {function}
*/
log4js.addLayout('patternWithTokens', (cfg) => {
log4js.addLayout('patternWithTokens', cfg => {
const pattern = cfg && cfg.pattern ? cfg.pattern : '%m';
const baseTokens = cfg && cfg.tokens ? cfg.tokens : {};
const tokens = Object.assign({}, baseTokens, {
usid (ev) {
usid(ev) {
const id = ev && ev.context && ev.context.USERSESSIONID;
return id ? ` [${id}]` : '';
}

12
DocService/sources/wopiClient.js
View File

@ -835,7 +835,17 @@ function putRelativeFile(ctx, wopiSrc, access_token, data, dataStream, dataSize,
ctx.logger.debug('wopi putRelativeFile request uri=%s headers=%j', uri, headers);
//isInJwtToken is true because it passed checkIpFilter for wopi
const isInJwtToken = true;
const postRes = yield utils.postRequestPromise(ctx, uri, data, dataStream, dataSize, tenCallbackRequestTimeout, undefined, isInJwtToken, headers);
const postRes = yield utils.postRequestPromise(
ctx,
uri,
data,
dataStream,
dataSize,
tenCallbackRequestTimeout,
undefined,
isInJwtToken,
headers
);
ctx.logger.debug('wopi putRelativeFile response headers=%j', postRes.response.headers);
ctx.logger.debug('wopi putRelativeFile response body:%s', postRes.body);
res = JSON.parse(postRes.body);