@crowdin/app-project-module 0.31.0 → 0.32.1

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

@@ -13,10 +13,10 @@ 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)('Received OAuth login url request', config.logger);
+        req.logInfo('Received OAuth login url request');
         const { oauthLogin } = integration;
         if (!oauthLogin) {
-            (0, util_1.log)('OAuth login url request is not supported', config.logger);
+            req.logInfo('OAuth login url request is not supported');
             res.status(400).end();
             return;
         }
@@ -25,6 +25,6 @@ function handle(config, integration) {
             ? oauthLogin.getAuthorizationUrl(`${config.baseUrl}${(0, defaults_1.getOauthRoute)(integration)}`, loginForm)
             : (0, defaults_1.constructOauthUrl)(config, integration);
         res.send({ url });
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/settings-save.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/settings-save.js

@@ -18,7 +18,7 @@ const webhooks_1 = require("../../util/webhooks");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const appSettings = req.body.config;
-        (0, util_1.log)(`Saving settings ${JSON.stringify(appSettings, null, 2)}`, config.logger);
+        req.logInfo(`Saving settings ${JSON.stringify(appSettings, null, 2)}`);
         yield (0, storage_1.getStorage)().updateIntegrationConfig(req.crowdinContext.clientId, JSON.stringify(appSettings));
         if (integration.webhooks) {
             yield (0, webhooks_1.registerWebhooks)(config, integration, req.crowdinApiClient, req.crowdinContext, req.integrationCredentials, appSettings);
@@ -34,6 +34,6 @@ function handle(config, integration) {
             yield (0, cron_1.createOrUpdateSyncSettings)(config, req, [], models_1.Provider.INTEGRATION, true);
         }
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

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

@@ -1,4 +1,3 @@
 /// <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;
+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/integration/settings.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* () {
         let settings = {};
         if (req.integrationSettings) {
             settings = req.integrationSettings;
         }
         res.send(settings);
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/sync-settings-save.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/sync-settings-save.js

@@ -21,6 +21,6 @@ function handle(config, integration) {
             yield (0, file_snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider);
         }
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/integration/sync-settings.d.ts

@@ -1,4 +1,3 @@
 /// <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;
+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/integration/sync-settings.js

@@ -11,17 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../../storage");
 const util_1 = require("../../util");
-function handle(config) {
+function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         let files = {};
         const provider = req.params.provider || req.body.provider;
-        (0, util_1.log)(`Loading sync settings for provider ${provider}`, config.logger);
+        req.logInfo(`Loading sync settings for provider ${provider}`);
         const syncSettings = yield (0, storage_1.getStorage)().getSyncSettingsByProvider(req.crowdinContext.clientId, provider);
         if (syncSettings) {
             files = JSON.parse(syncSettings.files) || [];
         }
-        (0, util_1.log)(`Returning sync settings ${JSON.stringify(files, null, 2)}`, config.logger);
+        req.logInfo(`Returning sync settings ${JSON.stringify(files, null, 2)}`);
         res.send(files);
-    }), config.onError);
+    }));
 }
 exports.default = handle;

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

@@ -1,4 +1,3 @@
 /// <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;
+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/integration/synced-files.js

@@ -11,16 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../../storage");
 const util_1 = require("../../util");
-function handle(config) {
+function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         let fileIds = [];
-        (0, util_1.log)('Loading synced files', config.logger);
+        req.logInfo('Loading synced files');
         const syncedFiles = yield (0, storage_1.getStorage)().getSyncedFiles(req.crowdinContext.clientId, req.crowdinContext.crowdinId);
         if (syncedFiles) {
             fileIds = JSON.parse(syncedFiles.fileIds) || [];
         }
-        (0, util_1.log)(`Returning synced files ${JSON.stringify(fileIds, null, 2)}`, config.logger);
+        req.logInfo(`Returning synced files ${JSON.stringify(fileIds, null, 2)}`);
         res.send(fileIds);
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/manifest.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../models");
-const connection_1 = require("../util/connection");
 const util_1 = require("../util");
 const api_1 = require("../util/api/api");
+const connection_1 = require("../util/connection");
 function handle(config) {
     const modules = {};
     if (config.projectIntegration) {
@@ -12,7 +12,7 @@ function handle(config) {
                 key: config.identifier + '-int',
                 name: config.name,
                 description: config.description,
-                logo: (0, util_1.getLogoUrl)(config, config.projectIntegration, '/integration'),
+                logo: (0, util_1.getLogoUrl)(config.projectIntegration, '/integration'),
                 url: '/',
                 environments: config.projectIntegration.environments,
             },
@@ -74,7 +74,7 @@ function handle(config) {
             {
                 key: config.identifier + '-mt',
                 name: config.name,
-                logo: (0, util_1.getLogoUrl)(config, config.customMT, '/mt'),
+                logo: (0, util_1.getLogoUrl)(config.customMT, '/mt'),
                 url: '/translate',
                 environments: config.customMT.environments,
                 withContext: !!config.customMT.withContext,
@@ -87,7 +87,7 @@ function handle(config) {
                 key: config.identifier + '-resources',
                 name: config.organizationMenu.name || config.name,
                 url: '/resources/' + (config.organizationMenu.fileName || 'index.html'),
-                icon: (0, util_1.getLogoUrl)(config, config.organizationMenu, '/resources'),
+                icon: (0, util_1.getLogoUrl)(config.organizationMenu, '/resources'),
             },
         ];
     }
@@ -97,7 +97,7 @@ function handle(config) {
                 key: config.identifier + '-profile-resources-menu',
                 name: config.profileResourcesMenu.name || config.name,
                 url: '/resources/' + (config.profileResourcesMenu.fileName || 'index.html'),
-                icon: (0, util_1.getLogoUrl)(config, config.profileResourcesMenu, '/resources'),
+                icon: (0, util_1.getLogoUrl)(config.profileResourcesMenu, '/resources'),
                 environments: config.profileResourcesMenu.environments,
             },
         ];
@@ -138,7 +138,7 @@ function handle(config) {
                 key: config.identifier + '-tools',
                 name: config.projectTools.name || config.name,
                 description: config.description,
-                logo: (0, util_1.getLogoUrl)(config, config.projectTools, '/tools'),
+                logo: (0, util_1.getLogoUrl)(config.projectTools, '/tools'),
                 url: '/tools/' + (config.projectTools.fileName || 'index.html'),
                 environments: config.projectTools.environments,
             },
@@ -150,7 +150,7 @@ function handle(config) {
                 key: config.identifier + '-project-reports',
                 name: config.projectReports.name || config.name,
                 description: config.description,
-                logo: (0, util_1.getLogoUrl)(config, config.projectReports, '/reports'),
+                logo: (0, util_1.getLogoUrl)(config.projectReports, '/reports'),
                 url: '/reports/' + (config.projectReports.fileName || 'index.html'),
             },
         ];

package/out/handlers/subscription-paid.d.ts

@@ -1,4 +1,3 @@
 /// <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(): (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/subscription-paid.js

@@ -11,12 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../util");
 const connection_1 = require("../util/connection");
-function handle(config) {
+const logger_1 = require("../util/logger");
+function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const organizationId = (req.query || {})['organization_id'] || (req.body || {})['organization_id'];
-        (0, util_1.log)(`Received subscription paid request for organization ${organizationId}`, config.logger);
+        (0, logger_1.log)(`Received subscription paid request for organization ${organizationId}`);
         (0, connection_1.clearCache)(organizationId);
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/handlers/uninstall.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/uninstall.js

@@ -12,11 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../storage");
 const util_1 = require("../util");
 const connection_1 = require("../util/connection");
+const logger_1 = require("../util/logger");
 const webhooks_1 = require("../util/webhooks");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const event = req.body;
-        (0, util_1.log)(`Received uninstall request ${JSON.stringify(event, null, 2)}`, config.logger);
+        (0, logger_1.log)(`Received uninstall request ${JSON.stringify(event, null, 2)}`);
         const projectIntegration = config.projectIntegration;
         const organization = (event.domain || event.organizationId).toString();
         if (config.onUninstall) {
@@ -32,20 +33,20 @@ function handle(config) {
                     return { settings, credentials };
                 })));
             }
-            (0, util_1.log)('Invoking onUninstall hook', config.logger);
+            (0, logger_1.log)('Invoking onUninstall hook');
             yield config.onUninstall(organization, allCredentials);
         }
         if (projectIntegration) {
             if (projectIntegration.webhooks) {
                 yield (0, webhooks_1.unregisterAllCrowdinWebhooks)(config, projectIntegration, organization);
             }
-            (0, util_1.log)(`Deleting all integration credentials for ${organization} organization`, config.logger);
+            (0, logger_1.log)(`Deleting all integration credentials for ${organization} organization`);
             yield (0, storage_1.getStorage)().deleteAllIntegrationCredentials(organization);
         }
-        (0, util_1.log)(`Deleting crowdin credentials for ${organization} organization`, config.logger);
+        (0, logger_1.log)(`Deleting crowdin credentials for ${organization} organization`);
         yield (0, storage_1.getStorage)().deleteCrowdinCredentials(organization);
-        (0, util_1.log)('App has been uninstalled', config.logger);
+        (0, logger_1.log)('App has been uninstalled');
         res.status(204).end();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/index.d.ts

@@ -1,7 +1,7 @@
 import { Express } from 'express';
 import { ClientConfig, Config, CrowdinAppUtilities } from './models';
 import express from './util/terminus-express';
-export { Scope, UserPermissions, ProjectPermissions } from './models';
+export { ProjectPermissions, Scope, UserPermissions } from './models';
 export { express };
 export declare function addCrowdinEndpoints(app: Express, clientConfig: Config | ClientConfig): CrowdinAppUtilities;
 export declare function createApp(clientConfig: ClientConfig): void;

package/out/index.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createApp = exports.addCrowdinEndpoints = exports.express = exports.ProjectPermissions = exports.UserPermissions = exports.Scope = void 0;
+exports.createApp = exports.addCrowdinEndpoints = exports.express = exports.UserPermissions = exports.Scope = exports.ProjectPermissions = void 0;
 const express_handlebars_1 = __importDefault(require("express-handlebars"));
 const cron = __importStar(require("node-cron"));
 const path_1 = require("path");
@@ -79,20 +79,23 @@ const api_1 = require("./util/api/api");
 const connection_1 = require("./util/connection");
 const cron_1 = require("./util/cron");
 const defaults_1 = require("./util/defaults");
+const logger = __importStar(require("./util/logger"));
+const logger_1 = require("./util/logger");
 const terminus_express_1 = __importDefault(require("./util/terminus-express"));
 exports.express = terminus_express_1.default;
 const webhooks_1 = require("./util/webhooks");
 var models_2 = require("./models");
+Object.defineProperty(exports, "ProjectPermissions", { enumerable: true, get: function () { return models_2.ProjectPermissions; } });
 Object.defineProperty(exports, "Scope", { enumerable: true, get: function () { return models_2.Scope; } });
 Object.defineProperty(exports, "UserPermissions", { enumerable: true, get: function () { return models_2.UserPermissions; } });
-Object.defineProperty(exports, "ProjectPermissions", { enumerable: true, get: function () { return models_2.ProjectPermissions; } });
 function addCrowdinEndpoints(app, clientConfig) {
     var _a, _b, _c, _d, _e, _f, _g;
     const config = (0, defaults_1.convertClientConfig)(clientConfig);
     if (!config.disableGlobalErrorHandling) {
-        handleUncaughtErrors(config);
+        handleUncaughtErrors();
     }
     storage.initialize(config);
+    logger.initialize(config);
     app.use(terminus_express_1.default.json({ limit: '50mb' }));
     app.use('/assets', terminus_express_1.default.static((0, path_1.join)(__dirname, 'static')));
     app.set('views', (0, path_1.join)(__dirname, 'views'));
@@ -124,31 +127,31 @@ function addCrowdinEndpoints(app, clientConfig) {
         },
     }));
     app.set('view engine', 'handlebars');
-    app.get((0, util_1.getLogoUrl)(config), (req, res) => res.sendFile(config.imagePath));
+    app.get((0, util_1.getLogoUrl)(), (req, res) => res.sendFile(config.imagePath));
     app.post('/installed', (0, install_1.default)(config));
     app.post('/uninstall', (0, uninstall_1.default)(config));
     app.get('/manifest.json', json_response_1.default, (0, manifest_1.default)(config));
     if (!(0, connection_1.isAppFree)(config)) {
-        app.post('/subscription-paid', (0, subscription_paid_1.default)(config));
+        app.post('/subscription-paid', (0, subscription_paid_1.default)());
     }
     const integrationLogic = config.projectIntegration;
     if (integrationLogic) {
         (0, defaults_1.applyIntegrationModuleDefaults)(config, integrationLogic);
-        app.get((0, util_1.getLogoUrl)(config, integrationLogic, '/integration'), (req, res) => res.sendFile(integrationLogic.imagePath || config.imagePath));
+        app.get((0, util_1.getLogoUrl)(integrationLogic, '/integration'), (req, res) => res.sendFile(integrationLogic.imagePath || config.imagePath));
         app.get('/', (0, crowdin_client_1.default)(config, true, false), (0, integration_credentials_1.default)(config, integrationLogic, true), (0, main_1.default)(config, integrationLogic));
         app.get('/api/subscription-info', json_response_1.default, (0, crowdin_client_1.default)(config), (0, subscription_info_1.default)(config));
         app.post('/api/settings', (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, settings_save_1.default)(config, integrationLogic));
         app.post('/api/login', (0, crowdin_client_1.default)(config, false, false), (0, integration_login_1.default)(config, integrationLogic));
         app.post('/api/logout', (0, crowdin_client_1.default)(config, false, false), (0, integration_credentials_1.default)(config, integrationLogic), (0, integration_logout_1.default)(config, integrationLogic));
         app.get('/api/crowdin/files', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, crowdin_files_1.default)(config, integrationLogic));
-        app.get('/api/crowdin/project', json_response_1.default, (0, crowdin_client_1.default)(config), (0, crowdin_project_1.default)(config));
-        app.get('/api/crowdin/file-progress/:fileId', (0, crowdin_client_1.default)(config), (0, crowdin_file_progress_1.default)(config, integrationLogic));
-        app.get('/api/integration/data', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, integration_data_1.default)(config, integrationLogic));
+        app.get('/api/crowdin/project', json_response_1.default, (0, crowdin_client_1.default)(config), (0, crowdin_project_1.default)());
+        app.get('/api/crowdin/file-progress/:fileId', (0, crowdin_client_1.default)(config), (0, crowdin_file_progress_1.default)(integrationLogic));
+        app.get('/api/integration/data', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, integration_data_1.default)(integrationLogic));
         app.post('/api/crowdin/update', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, crowdin_update_1.default)(config, integrationLogic));
         app.post('/api/integration/update', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, integration_update_1.default)(config, integrationLogic));
-        app.get('/api/sync-settings/:provider', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, sync_settings_1.default)(config));
+        app.get('/api/sync-settings/:provider', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, sync_settings_1.default)());
         app.post('/api/sync-settings', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, sync_settings_save_1.default)(config, integrationLogic));
-        app.get('/api/synced-files', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, synced_files_1.default)(config));
+        app.get('/api/synced-files', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, integrationLogic), (0, synced_files_1.default)());
         if (integrationLogic.oauthLogin) {
             app.get((0, defaults_1.getOauthRoute)(integrationLogic), (0, oauth_login_1.default)(config, integrationLogic));
             app.post('/api/oauth-url', json_response_1.default, (0, crowdin_client_1.default)(config, false, false), (0, oauth_url_1.default)(config, integrationLogic));
@@ -180,7 +183,7 @@ function addCrowdinEndpoints(app, clientConfig) {
         }
     }
     if (config.customFileFormat) {
-        app.post('/process', (0, crowdin_client_1.default)(config), (0, custom_file_format_1.default)(config, config.baseUrl, config.customFileFormat.filesFolder || config.dbFolder, config.customFileFormat));
+        app.post('/process', (0, crowdin_client_1.default)(config), (0, custom_file_format_1.default)(config.baseUrl, config.customFileFormat.filesFolder || config.dbFolder, config.customFileFormat));
         app.get('/file/download', (0, file_download_1.default)(config, config.customFileFormat, 'custom-file-format'));
     }
     if (config.filePreImport) {
@@ -200,39 +203,39 @@ function addCrowdinEndpoints(app, clientConfig) {
         app.get(`/file/download/${models_1.ProcessFileJobType.POST_EXPORT}`, (0, file_download_1.default)(config, config.filePostExport, models_1.ProcessFileJobType.POST_EXPORT));
     }
     if (config.customMT) {
-        app.get((0, util_1.getLogoUrl)(config, config.customMT, '/mt'), (req, res) => { var _a; return res.sendFile(((_a = config.customMT) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
-        app.post('/translate', (0, crowdin_client_1.default)(config), (0, translate_1.default)(config, config.customMT));
+        app.get((0, util_1.getLogoUrl)(config.customMT, '/mt'), (req, res) => { var _a; return res.sendFile(((_a = config.customMT) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
+        app.post('/translate', (0, crowdin_client_1.default)(config), (0, translate_1.default)(config.customMT));
     }
     if (config.profileResourcesMenu) {
-        app.get((0, util_1.getLogoUrl)(config, config.profileResourcesMenu, '/resources'), (req, res) => { var _a; return res.sendFile(((_a = config.profileResourcesMenu) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
-        app.use('/resources', (0, ui_module_1.default)(config, config.profileResourcesMenu.allowUnauthorized), (0, render_ui_module_1.default)(config, config.profileResourcesMenu));
+        app.get((0, util_1.getLogoUrl)(config.profileResourcesMenu, '/resources'), (req, res) => { var _a; return res.sendFile(((_a = config.profileResourcesMenu) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
+        app.use('/resources', (0, ui_module_1.default)(config, config.profileResourcesMenu.allowUnauthorized), (0, render_ui_module_1.default)(config.profileResourcesMenu));
     }
     if (config.organizationMenu) {
-        app.get((0, util_1.getLogoUrl)(config, config.organizationMenu, '/resources'), (req, res) => { var _a; return res.sendFile(((_a = config.organizationMenu) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
-        app.use('/resources', (0, ui_module_1.default)(config, config.organizationMenu.allowUnauthorized), (0, render_ui_module_1.default)(config, config.organizationMenu));
+        app.get((0, util_1.getLogoUrl)(config.organizationMenu, '/resources'), (req, res) => { var _a; return res.sendFile(((_a = config.organizationMenu) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
+        app.use('/resources', (0, ui_module_1.default)(config, config.organizationMenu.allowUnauthorized), (0, render_ui_module_1.default)(config.organizationMenu));
     }
     if (config.editorRightPanel) {
-        app.use('/editor-panels', (0, ui_module_1.default)(config, config.editorRightPanel.allowUnauthorized), (0, render_ui_module_1.default)(config, config.editorRightPanel));
+        app.use('/editor-panels', (0, ui_module_1.default)(config, config.editorRightPanel.allowUnauthorized), (0, render_ui_module_1.default)(config.editorRightPanel));
     }
     if (config.projectMenu) {
-        app.use('/project-menu', (0, ui_module_1.default)(config, config.projectMenu.allowUnauthorized), (0, render_ui_module_1.default)(config, config.projectMenu));
+        app.use('/project-menu', (0, ui_module_1.default)(config, config.projectMenu.allowUnauthorized), (0, render_ui_module_1.default)(config.projectMenu));
     }
     if (config.projectMenuCrowdsource) {
-        app.use('/project-menu-crowdsource', (0, ui_module_1.default)(config, config.projectMenuCrowdsource.allowUnauthorized), (0, render_ui_module_1.default)(config, config.projectMenuCrowdsource));
+        app.use('/project-menu-crowdsource', (0, ui_module_1.default)(config, config.projectMenuCrowdsource.allowUnauthorized), (0, render_ui_module_1.default)(config.projectMenuCrowdsource));
     }
     if (config.projectTools) {
-        app.get((0, util_1.getLogoUrl)(config, config.projectTools, '/tools'), (req, res) => { var _a; return res.sendFile(((_a = config.projectTools) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
-        app.use('/tools', (0, ui_module_1.default)(config, config.projectTools.allowUnauthorized), (0, render_ui_module_1.default)(config, config.projectTools));
+        app.get((0, util_1.getLogoUrl)(config.projectTools, '/tools'), (req, res) => { var _a; return res.sendFile(((_a = config.projectTools) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
+        app.use('/tools', (0, ui_module_1.default)(config, config.projectTools.allowUnauthorized), (0, render_ui_module_1.default)(config.projectTools));
     }
     if (config.projectReports) {
-        app.get((0, util_1.getLogoUrl)(config, config.projectReports, '/reports'), (req, res) => { var _a; return res.sendFile(((_a = config.projectReports) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
-        app.use('/reports', (0, ui_module_1.default)(config, config.projectReports.allowUnauthorized), (0, render_ui_module_1.default)(config, config.projectReports));
+        app.get((0, util_1.getLogoUrl)(config.projectReports, '/reports'), (req, res) => { var _a; return res.sendFile(((_a = config.projectReports) === null || _a === void 0 ? void 0 : _a.imagePath) || config.imagePath); });
+        app.use('/reports', (0, ui_module_1.default)(config, config.projectReports.allowUnauthorized), (0, render_ui_module_1.default)(config.projectReports));
     }
     if (((_d = config.modal) === null || _d === void 0 ? void 0 : _d.uiPath) || ((_e = config.modal) === null || _e === void 0 ? void 0 : _e.formSchema)) {
-        app.use('/modal', (0, ui_module_1.default)(config, config.modal.allowUnauthorized), (0, render_ui_module_1.default)(config, config.modal));
+        app.use('/modal', (0, ui_module_1.default)(config, config.modal.allowUnauthorized), (0, render_ui_module_1.default)(config.modal));
     }
     if (((_f = config.contextMenu) === null || _f === void 0 ? void 0 : _f.uiPath) || ((_g = config.contextMenu) === null || _g === void 0 ? void 0 : _g.formSchema)) {
-        app.use('/context', (0, ui_module_1.default)(config, config.contextMenu.allowUnauthorized), (0, render_ui_module_1.default)(config, config.contextMenu));
+        app.use('/context', (0, ui_module_1.default)(config, config.contextMenu.allowUnauthorized), (0, render_ui_module_1.default)(config.contextMenu));
     }
     if (config.api) {
         if (config.api.default) {
@@ -278,11 +281,11 @@ function addCrowdinEndpoints(app, clientConfig) {
         encryptCrowdinConnection: (data) => (0, util_1.encryptData)(config, JSON.stringify(data)),
         dencryptCrowdinConnection: (hash) => __awaiter(this, void 0, void 0, function* () {
             const { crowdinId, extra } = JSON.parse((0, util_1.decryptData)(config, hash));
-            const creds = yield storage.getStorage().getCrowdinCredentials(crowdinId);
-            if (!creds) {
+            const credentials = yield storage.getStorage().getCrowdinCredentials(crowdinId);
+            if (!credentials) {
                 throw new Error('Failed to find Crowdin credentials');
             }
-            const { client } = yield (0, connection_1.prepareCrowdinClient)(config, creds);
+            const { client } = yield (0, connection_1.prepareCrowdinClient)({ config, credentials });
             return { client, extra };
         }),
     };
@@ -296,14 +299,14 @@ function createApp(clientConfig) {
     app.listen(config.port, () => console.log(`App started on port ${config.port}`));
 }
 exports.createApp = createApp;
-function handleUncaughtErrors(config) {
+function handleUncaughtErrors() {
     process
         .on('unhandledRejection', (reason) => {
         const error = `Unhandled Rejection. Reason: ${reason.stack || reason}`;
-        (0, util_1.logError)(error, config.onError);
+        (0, logger_1.logError)(error);
     })
         .on('uncaughtException', (reason) => {
         const error = `Uncaught Exception. Reason: ${reason.stack || reason}`;
-        (0, util_1.logError)(error, config.onError);
+        (0, logger_1.logError)(error);
     });
 }

package/out/middlewares/crowdin-client.d.ts

@@ -2,10 +2,13 @@
 import Crowdin from '@crowdin/crowdin-api-client';
 import { Response } from 'express';
 import { Config, CrowdinClientRequest, CrowdinContextInfo, SubscriptionInfo } from '../models';
+import { LogErrorFunction, LogFunction } from '../util/logger';
 export declare function prepareCrowdinRequest(jwtToken: string, config: Config, optional?: boolean, checkSubscriptionExpiration?: boolean): Promise<{
     context: CrowdinContextInfo;
+    logInfo: LogFunction;
+    logError: LogErrorFunction;
     client?: Crowdin;
     subscriptionInfo?: SubscriptionInfo;
 }>;
-export default function handle(config: Config, optional?: boolean, checkSubscriptionExpiration?: boolean): (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, optional?: boolean, checkSubscriptionExpiration?: boolean): (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;
 export declare function getToken(req: CrowdinClientRequest): string | undefined;

package/out/middlewares/crowdin-client.js

@@ -13,35 +13,48 @@ exports.getToken = exports.prepareCrowdinRequest = void 0;
 const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
 const storage_1 = require("../storage");
 const util_1 = require("../util");
-const connection_1 = require("../util/connection");
 const api_1 = require("../util/api/api");
+const connection_1 = require("../util/connection");
+const logger_1 = require("../util/logger");
 function prepareCrowdinRequest(jwtToken, config, optional = false, checkSubscriptionExpiration = true) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Validating jwt token from incoming request', config.logger);
+        (0, logger_1.log)('Validating jwt token from incoming request');
         const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret, config.jwtValidationOptions);
         const context = {
             jwtPayload,
             clientId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),
             crowdinId: `${jwtPayload.domain || jwtPayload.context.organization_id}`,
         };
-        (0, util_1.log)('Loading crowdin credentials', config.logger);
+        const logContext = {
+            orgId: context.crowdinId,
+            userId: context.clientId,
+            projectId: jwtPayload.context.project_id,
+        };
+        const logInfo = (0, logger_1.withContext)(logContext);
+        const logError = (0, logger_1.withContextError)(logContext);
+        logInfo('Loading crowdin credentials');
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(context.crowdinId);
         if (!credentials) {
             if (optional) {
-                return { context };
+                return { context, logInfo, logError };
             }
             throw new Error("Can't find organization by id");
         }
-        (0, util_1.log)('Building crowdin client instance', config.logger);
-        const { client, token } = yield (0, connection_1.prepareCrowdinClient)(config, credentials);
+        logInfo('Building crowdin client instance');
+        const { client, token } = yield (0, connection_1.prepareCrowdinClient)({ config, credentials });
         let subscriptionInfo;
         if (checkSubscriptionExpiration) {
-            subscriptionInfo = yield (0, connection_1.checkSubscription)(config, token, credentials.id, credentials.type);
+            subscriptionInfo = yield (0, connection_1.checkSubscription)({
+                config,
+                token,
+                organization: credentials.id,
+                accountType: credentials.type,
+            });
             if (subscriptionInfo.expired) {
                 throw new util_1.CodeError(subscriptionInfo.subscribeLink || '', 402);
             }
         }
-        return { context, client, subscriptionInfo };
+        return { context, client, subscriptionInfo, logInfo, logError };
     });
 }
 exports.prepareCrowdinRequest = prepareCrowdinRequest;
@@ -62,22 +75,19 @@ function handle(config, optional = false, checkSubscriptionExpiration = true) {
                 req.crowdinApiClient = data.client;
             }
             req.subscriptionInfo = data.subscriptionInfo;
+            req.logInfo = data.logInfo;
+            req.logError = data.logError;
             next();
         }
         catch (e) {
+            (0, logger_1.logError)(e);
             if (e instanceof util_1.CodeError) {
                 throw e;
             }
-            if (config.onError) {
-                config.onError(e);
-            }
-            else {
-                console.error(e);
-            }
-            const message = typeof e === 'string' ? e : e.message;
+            const message = (0, logger_1.getErrorMessage)(e);
             return res.status(403).send({ error: message || 'Error' });
         }
-    }), config.onError);
+    }));
 }
 exports.default = handle;
 function getToken(req) {

package/out/middlewares/integration-credentials.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, optional?: boolean): (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, optional?: boolean): (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/middlewares/integration-credentials.js

@@ -15,7 +15,7 @@ const connection_1 = require("../util/connection");
 function handle(config, integration, optional = false) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         const clientId = req.crowdinContext.clientId;
-        (0, util_1.log)(`Loading integration credentials for client ${clientId}`, config.logger);
+        req.logInfo(`Loading integration credentials for client ${clientId}`);
         const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(clientId);
         if (!integrationCredentials) {
             if (optional) {
@@ -34,6 +34,6 @@ function handle(config, integration, optional = false) {
             throw new util_1.CodeError('Credentials to integration either exprired or invalid', 401);
         }
         next();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/middlewares/render-ui-module.d.ts

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