@crowdin/app-project-module 0.31.0 → 0.32.1

package/out/handlers/custom-mt/translate.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, CustomMTLogic } from '../../models';
-export default function handle(baseConfig: Config, config: CustomMTLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { CrowdinClientRequest, CustomMTLogic } from '../../models';
+export default function handle(config: CustomMTLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/custom-mt/translate.js

@@ -10,14 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../util");
-function handle(baseConfig, config) {
+const logger_1 = require("../../util/logger");
+function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const source = req.query.source;
         const target = req.query.target;
         const body = req.body;
-        (0, util_1.log)('Received request for custom mt', baseConfig.logger);
-        (0, util_1.log)(`Source language ${source}, target language ${target}`, baseConfig.logger);
-        (0, util_1.log)(`Payload ${JSON.stringify(body, null, 2)}`, baseConfig.logger);
+        (0, logger_1.log)('Received request for custom mt');
+        (0, logger_1.log)(`Source language ${source}, target language ${target}`);
+        (0, logger_1.log)(`Payload ${JSON.stringify(body, null, 2)}`);
         const projectId = Number(req.query.project_id);
         try {
             if (source === 'en' && target === 'de' && body.strings && body.strings[0] === 'validation') {
@@ -32,11 +33,12 @@ function handle(baseConfig, config) {
             }
         }
         catch (e) {
-            const message = (0, util_1.getMessage)(e);
+            req.logError(e);
+            const message = (0, logger_1.getErrorMessage)(e);
             res.send({
                 error: { message },
             });
         }
-    }), baseConfig.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/file-processing/custom-file-format.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, CustomFileFormatLogic } from '../../models';
-export default function handle(baseConfig: Config, baseUrl: string, folder: string, config: CustomFileFormatLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { CrowdinClientRequest, CustomFileFormatLogic } from '../../models';
+export default function handle(baseUrl: string, folder: string, config: CustomFileFormatLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/file-processing/custom-file-format.js

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
 const models_1 = require("../../models");
 const util_1 = require("../../util");
 const files_1 = require("../../util/files");
-function handle(baseConfig, baseUrl, folder, config) {
+function handle(baseUrl, folder, config) {
     if (!fs_1.default.existsSync(path_1.default.join(folder, 'custom-file-format'))) {
         fs_1.default.mkdirSync(path_1.default.join(folder, 'custom-file-format'), { recursive: true });
     }
@@ -31,7 +31,7 @@ function handle(baseConfig, baseUrl, folder, config) {
         else {
             logData = body;
         }
-        (0, util_1.log)(`Received request to process file ${JSON.stringify(logData, null, 2)}`, baseConfig.logger);
+        req.logInfo(`Received request to process file ${JSON.stringify(logData, null, 2)}`);
         let file;
         if (body.file.content) {
             file = Buffer.from(body.file.content, 'base64').toString();
@@ -54,9 +54,9 @@ function handle(baseConfig, baseUrl, folder, config) {
                 break;
         }
         const responseLength = Buffer.byteLength(JSON.stringify(response), 'utf8');
-        (0, util_1.log)(`Returning response (${responseLength} bytes) from process file action`, baseConfig.logger);
+        req.logInfo(`Returning response (${responseLength} bytes) from process file action`);
         res.send({ data: response, error: error ? { message: error } : undefined });
-    }), baseConfig.onError);
+    }));
 }
 exports.default = handle;
 function handleBuildFile(baseUrl, dataFolder, config, req, client, context, projectId, file) {

package/out/handlers/file-processing/file-download.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config, FileProcessLogic } from '../../models';
-export default function handle(config: Config, processingConfig: FileProcessLogic, folderName: string): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, processingConfig: FileProcessLogic, folderName: string): (req: import("../../models").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/file-processing/file-download.js

@@ -15,11 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("../../util");
+const logger_1 = require("../../util/logger");
 function handle(config, processingConfig, folderName) {
     const folder = processingConfig.filesFolder || config.dbFolder;
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const filePath = path_1.default.join(folder, folderName, req.query.file);
-        (0, util_1.log)(`Downloading file ${filePath}`, config.logger);
+        (0, logger_1.log)(`Downloading file ${filePath}`);
         res.download(filePath, function (err) {
             if (err) {
                 console.error(err);
@@ -28,6 +29,6 @@ function handle(config, processingConfig, folderName) {
                 fs_1.default.unlinkSync(filePath);
             }
         });
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/file-processing/pre-post-process.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, FileImportExportLogic } from '../../models';
-export default function handle(baseConfig: Config, config: FileImportExportLogic, folderName: string): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { Config, CrowdinClientRequest, FileImportExportLogic } from '../../models';
+export default function handle(baseConfig: Config, config: FileImportExportLogic, folderName: string): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/file-processing/pre-post-process.js

@@ -28,6 +28,7 @@ function handle(baseConfig, config, folderName) {
         const body = req.body;
         let processingError;
         let fileContent;
+        let rawContent;
         if (body.stringsUrl) {
             fileContent = yield (0, files_1.getFileContent)(body.stringsUrl, true);
         }
@@ -35,10 +36,17 @@ function handle(baseConfig, config, folderName) {
             fileContent = body.strings;
         }
         else if (body.file.contentUrl) {
-            fileContent = yield (0, files_1.getFileContent)(body.file.contentUrl);
+            rawContent = yield (0, files_1.getFileContent)(body.file.contentUrl);
+            fileContent = Buffer.from(rawContent).toString('base64');
         }
         else if (body.file.content) {
-            fileContent = Buffer.from(body.file.content, 'base64').toString();
+            rawContent = body.file.content;
+            fileContent = Buffer.from(rawContent, 'base64');
+        }
+        if (body.jobType === models_1.ProcessFileJobType.PRE_IMPORT || body.jobType === models_1.ProcessFileJobType.POST_EXPORT) {
+            body.getRawContent = (encoding) => __awaiter(this, void 0, void 0, function* () {
+                return Buffer.from(rawContent, 'base64').toString(encoding);
+            });
         }
         const fileProcessResult = yield config.fileProcess(body, fileContent, req.crowdinApiClient, req.crowdinContext, req.crowdinContext.jwtPayload.context.project_id);
         switch (body.jobType) {
@@ -94,6 +102,6 @@ function handle(baseConfig, config, folderName) {
                 break;
         }
         res.send({ data: response, error: processingError ? { message: processingError } : undefined });
-    }), baseConfig.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/form-data-display.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/form-data-save.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/install.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config } from '../models';
-export default function handle(config: Config): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config): (req: import("../models").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/install.js

@@ -13,9 +13,11 @@ const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 const util_1 = require("../util");
+const logger_1 = require("../util/logger");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const event = req.body;
+        (0, logger_1.log)(`Received install request ${JSON.stringify(event, null, 2)}`);
         const token = yield fetchToken(config, event);
         const credentials = {
             id: (event.domain || event.organizationId).toString(),
@@ -32,14 +34,14 @@ function handle(config) {
         const existingCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(credentials.id);
         if (!!existingCredentials) {
             yield (0, storage_1.getStorage)().updateCrowdinCredentials(credentials);
-            (0, util_1.log)('An existing App has been reinstalled', config.logger);
+            (0, logger_1.log)('An existing App has been reinstalled');
         }
         else {
             yield (0, storage_1.getStorage)().saveCrowdinCredentials(credentials);
-            (0, util_1.log)('A new App has been installed', config.logger);
+            (0, logger_1.log)('A new App has been installed');
         }
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;
 function fetchToken(config, event) {

package/out/handlers/integration/crowdin-file-progress.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { CrowdinClientRequest, IntegrationLogic } from '../../models';
+export default function handle(integration: IntegrationLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/crowdin-file-progress.js

@@ -10,18 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../util");
-function handle(config, integration) {
+function handle(integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const fileId = Number(req.params.fileId || req.body.fileId);
-        (0, util_1.log)(`Loading translation progress for file ${fileId}`, config.logger);
+        req.logInfo(`Loading translation progress for file ${fileId}`);
         if (integration.getFileProgress) {
             const progress = yield integration.getFileProgress(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, fileId);
-            (0, util_1.log)(`Translation progress for file ${fileId} ${JSON.stringify(progress, null, 2)}`, config.logger);
+            req.logInfo(`Translation progress for file ${fileId} ${JSON.stringify(progress, null, 2)}`);
             res.send(progress);
         }
         else {
             res.send({});
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/crowdin-files.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/crowdin-files.js

@@ -13,19 +13,19 @@ const util_1 = require("../../util");
 const defaults_1 = require("../../util/defaults");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Loading crowdin files', config.logger);
+        req.logInfo('Loading crowdin files');
         if (integration.getCrowdinFiles) {
             const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, req.crowdinContext.jwtPayload.context.project_id);
-            (0, util_1.log)(`Loading files ${rootFolder ? `from folder ${rootFolder.id}` : 'from root'}`, config.logger);
+            req.logInfo(`Loading files ${rootFolder ? `from folder ${rootFolder.id}` : 'from root'}`);
             const files = integration.getCrowdinFiles
                 ? yield integration.getCrowdinFiles(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, rootFolder, req.integrationSettings)
                 : [];
-            (0, util_1.log)(`Returning files ${JSON.stringify(files, null, 2)}`, config.logger);
+            req.logInfo(`Returning ${files.length} files`);
             res.send(files);
         }
         else {
             res.send([]);
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/crowdin-project.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config } from '../../models';
-export default function handle(config: Config): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { CrowdinClientRequest } from '../../models';
+export default function handle(): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/crowdin-project.js

@@ -10,13 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../util");
-function handle(config) {
+function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const projectId = req.crowdinContext.jwtPayload.context.project_id;
-        (0, util_1.log)(`Loading crowdin project ${projectId}`, config.logger);
+        req.logInfo(`Loading crowdin project ${projectId}`);
         const project = yield req.crowdinApiClient.projectsGroupsApi.getProject(projectId);
-        (0, util_1.log)(`Loaded crowdin project ${JSON.stringify(project, null, 2)}`, config.logger);
+        req.logInfo(`Loaded crowdin project ${projectId}`);
         res.send(project.data);
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/crowdin-update.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/crowdin-update.js

@@ -17,10 +17,10 @@ function handle(config, integration) {
         var _a, _b, _c;
         const projectId = req.crowdinContext.jwtPayload.context.project_id || (req === null || req === void 0 ? void 0 : req.body.projectId);
         const uploadTranslations = req.query.uploadTranslations === 'true' || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.uploadTranslations);
-        (0, util_1.log)(`Updating crowdin project ${projectId}`, config.logger);
+        req.logInfo(`Updating crowdin project ${projectId}`);
         const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
         if (rootFolder) {
-            (0, util_1.log)(`Updating crowdin files under folder ${rootFolder.id}`, config.logger);
+            req.logInfo(`Updating crowdin files under folder ${rootFolder.id}`);
         }
         // A request via API has a different structure
         if (((_b = config.api) === null || _b === void 0 ? void 0 : _b.default) && req.body.files) {
@@ -38,8 +38,8 @@ function handle(config, integration) {
             if (!fileIds) {
                 fileIds = req.body.map((file) => file.id);
             }
-            (0, synced_files_1.createOrUpdateSyncedFiles)({ config, req, fileIds });
+            (0, synced_files_1.createOrUpdateSyncedFiles)({ req, fileIds });
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/crowdin-webhook.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/crowdin-webhook.js

@@ -48,6 +48,6 @@ function handle(config, integration) {
             }
             res.send({ message });
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/integration-data.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { IntegrationLogic } from '../../models';
+export default function handle(integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/integration-data.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../util");
-function handle(config, integration) {
+function handle(integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const { parent_id: parentId, search, page } = req.query;
-        (0, util_1.log)('Recieved request to get integration data', config.logger);
+        req.logInfo('Recieved request to get integration data');
         const result = yield integration.getIntegrationFiles(req.integrationCredentials, req.integrationSettings, parentId, search, page);
         let message;
         let stopPagination;
@@ -26,8 +26,8 @@ function handle(config, integration) {
         else {
             files = result;
         }
-        (0, util_1.log)(`Integration data response ${JSON.stringify(files, null, 2)}`, config.logger);
+        req.logInfo(`Integration data response ${JSON.stringify(files, null, 2)}`);
         res.send({ data: files, message, stopPagination });
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/integration-login.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { Config, CrowdinClientRequest, IntegrationLogic } from '../../models';
+export default function handle(config: Config, integration: IntegrationLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/integration-login.js

@@ -13,18 +13,18 @@ const storage_1 = require("../../storage");
 const util_1 = require("../../util");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Received integration login request', config.logger);
+        req.logInfo('Received integration login request');
         if (integration.checkConnection) {
-            (0, util_1.log)('Checking the integration credentials', config.logger);
+            req.logInfo('Checking the integration credentials');
             yield integration.checkConnection(req.body.credentials);
         }
         const existing = yield (0, storage_1.getStorage)().getIntegrationCredentials(req.crowdinContext.clientId);
         if (!!existing) {
-            (0, util_1.log)('Deleting old credentials', config.logger);
+            req.logInfo('Deleting old credentials');
             yield (0, storage_1.getStorage)().deleteIntegrationCredentials(req.crowdinContext.clientId);
         }
         yield (0, storage_1.getStorage)().saveIntegrationCredentials(req.crowdinContext.clientId, (0, util_1.encryptData)(config, JSON.stringify(req.body.credentials)), req.crowdinContext.crowdinId);
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/integration-logout.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/integration-logout.js

@@ -15,18 +15,18 @@ const connection_1 = require("../../util/connection");
 const webhooks_1 = require("../../util/webhooks");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Received integration logout request', config.logger);
+        req.logInfo('Received integration logout request');
         if (integration.onLogout) {
-            (0, util_1.log)('Invoking onLogout hook', config.logger);
+            req.logInfo('Invoking onLogout hook');
             yield integration.onLogout(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials, req.integrationSettings);
         }
-        (0, util_1.log)(`Deleting integration credentials for ${req.crowdinContext.clientId} client`, config.logger);
+        req.logInfo(`Deleting integration credentials for ${req.crowdinContext.clientId} client`);
         yield (0, storage_1.getStorage)().deleteIntegrationCredentials(req.crowdinContext.clientId);
         (0, connection_1.clearCache)(req.crowdinContext.crowdinId);
         if (integration.webhooks) {
             yield (0, webhooks_1.unregisterWebhooks)(config, integration, req.crowdinApiClient, req.crowdinContext, req.integrationCredentials, req.integrationSettings);
         }
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/integration-update.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/integration-update.js

@@ -14,10 +14,10 @@ const defaults_1 = require("../../util/defaults");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        (0, util_1.log)('Updating integration data', config.logger);
+        req.logInfo('Updating integration data');
         const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, req.crowdinContext.jwtPayload.context.project_id);
         if (rootFolder) {
-            (0, util_1.log)(`Updating integration data for crowding root folder ${rootFolder.id}`, config.logger);
+            req.logInfo(`Updating integration data for crowding root folder ${rootFolder.id}`);
         }
         // A request via API has a different structure
         if (((_a = config.api) === null || _a === void 0 ? void 0 : _a.default) && req.body.files) {
@@ -29,6 +29,6 @@ function handle(config, integration) {
             message = result.message;
         }
         res.send({ message });
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/integration-webhook.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/integration-webhook.js

@@ -35,6 +35,6 @@ function handle(config, integration) {
         else {
             return res.status(403).send({ error: 'Access denied' });
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/main.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/main.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../util");
 const connection_1 = require("../../util/connection");
 const defaults_1 = require("../../util/defaults");
+const logger_1 = require("../../util/logger");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        const logger = req.logInfo || logger_1.log;
         const installed = !!req.crowdinApiClient;
         const loggedIn = !!req.integrationCredentials;
         const options = {
@@ -41,7 +43,7 @@ function handle(config, integration) {
             options.config = JSON.stringify(req.integrationSettings || {});
             options.reloadOnConfigSave = !!integration.reloadOnConfigSave;
             options.integrationPagination = integration.integrationPagination;
-            (0, util_1.log)(`Adding configuration fields ${JSON.stringify(configurationFields, null, 2)}`, config.logger);
+            logger(`Adding configuration fields ${JSON.stringify(configurationFields, null, 2)}`);
         }
         options.infoModal = integration.infoModal;
         options.syncNewElements = integration.syncNewElements;
@@ -63,8 +65,8 @@ function handle(config, integration) {
                 appIdentifier: config.identifier,
             }
             : null;
-        (0, util_1.log)(`Routing user to ${view} view`, config.logger);
+        logger(`Routing user to ${view} view`);
         return res.render(view, options);
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/oauth-login.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../models").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/integration/oauth-login.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const util_1 = require("../../util");
 const defaults_1 = require("../../util/defaults");
+const logger_1 = require("../../util/logger");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -22,12 +23,12 @@ function handle(config, integration) {
             uid: 'oauth_popup',
         };
         const code = req.query[((_b = (_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.fieldsMapping) === null || _b === void 0 ? void 0 : _b.code) || 'code'];
-        (0, util_1.log)(`Received request from OAuth login callback. Code ${code}`, config.logger);
+        (0, logger_1.log)(`Received request from OAuth login callback. Code ${code}`);
         try {
             const oauthLogin = integration.oauthLogin;
             let credentials;
             if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.performGetTokenRequest) {
-                (0, util_1.log)('Performing custom get bearer token request', config.logger);
+                (0, logger_1.log)('Performing custom get bearer token request');
                 credentials = yield oauthLogin.performGetTokenRequest(code, req.query, req.originalUrl);
             }
             else {
@@ -55,15 +56,10 @@ function handle(config, integration) {
             return res.render('oauth', { message: JSON.stringify(message) });
         }
         catch (e) {
-            if (config.onError) {
-                config.onError(e);
-            }
-            else {
-                console.error(e);
-            }
-            message.data = { error: (0, util_1.getMessage)(e) };
+            (0, logger_1.logError)(e);
+            message.data = { error: (0, logger_1.getErrorMessage)(e) };
             return res.render('oauth', { message: JSON.stringify(message) });
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/oauth-url.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config, IntegrationLogic } from '../../models';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
+import { Config, CrowdinClientRequest, IntegrationLogic } from '../../models';
+export default function handle(config: Config, integration: IntegrationLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;