@crowdin/app-project-module 0.31.0 → 0.32.1

package/out/middlewares/render-ui-module.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const util_1 = require("../util");
-function handle(config, moduleConfig) {
+function handle(moduleConfig) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         if (moduleConfig.formSchema) {
             return res.render('form', {
@@ -28,6 +28,6 @@ function handle(config, moduleConfig) {
             return express_1.default.static(moduleConfig.uiPath)(req, res, next);
         }
         throw new Error('uiPath or formSchema should be provided for module');
-    }), config.onError);
+    }));
 }
 exports.default = handle;

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

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 import { Request, Response } from 'express';
 import { Config } from '../models';
-export default function handle(config: Config, allowUnauthorized?: boolean): (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, allowUnauthorized?: boolean): (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/middlewares/ui-module.js

@@ -13,6 +13,7 @@ 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 logger_1 = require("../util/logger");
 function handle(config, allowUnauthorized = false) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         if (allowUnauthorized) {
@@ -23,21 +24,31 @@ function handle(config, allowUnauthorized = false) {
         if (!jwtToken) {
             return res.status(403).send({ error: 'Access denied' });
         }
-        (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 id = `${jwtPayload.domain || jwtPayload.context.organization_id}`;
-        (0, util_1.log)('Loading crowdin credentials', config.logger);
+        const logInfo = (0, logger_1.withContext)({
+            orgId: id,
+            userId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),
+            projectId: jwtPayload.context.project_id,
+        });
+        logInfo('Loading crowdin credentials');
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(id);
         if (!credentials) {
             throw new Error("Can't find organization by id");
         }
-        (0, util_1.log)('Building crowdin client instance', config.logger);
-        const { token } = yield (0, connection_1.prepareCrowdinClient)(config, credentials);
-        const { expired, subscribeLink } = yield (0, connection_1.checkSubscription)(config, token, credentials.id, credentials.type);
+        logInfo('Building crowdin client instance');
+        const { token } = yield (0, connection_1.prepareCrowdinClient)({ config, credentials });
+        const { expired, subscribeLink } = yield (0, connection_1.checkSubscription)({
+            config,
+            token,
+            organization: credentials.id,
+            accountType: credentials.type,
+        });
         if (expired) {
             return res.render('subscription', { subscribeLink });
         }
         next();
-    }), config.onError);
+    }));
 }
 exports.default = handle;

package/out/models/index.d.ts

@@ -3,6 +3,7 @@ import { JwtPayload, VerifyOptions } from '@crowdin/crowdin-apps-functions';
 import { Request } from 'express';
 import { MySQLStorageConfig } from '../storage/mysql';
 import { PostgreStorageConfig } from '../storage/postgre';
+import { LogContext, LogErrorFunction, LogFunction } from '../util/logger';
 export interface ClientConfig extends ImagePath {
     /**
      * Authentication Crowdin App type: "authorization_code", "crowdin_app". Default: "crowdin_app"
@@ -130,7 +131,7 @@ export interface ClientConfig extends ImagePath {
     /**
      * Error interceptor (can be used to log error in centralized place)
      */
-    onError?: (error: any) => void;
+    onError?: (error: any, context?: LogContext) => void;
     /**
      * Disable global error handling of unhandledRejection and uncaughtException events
      */
@@ -478,6 +479,8 @@ export interface CrowdinClientRequest extends Request {
     crowdinApiClient: Crowdin;
     crowdinContext: CrowdinContextInfo;
     subscriptionInfo?: SubscriptionInfo;
+    logInfo: LogFunction;
+    logError: LogErrorFunction;
 }
 export interface CrowdinCredentials {
     id: string;
@@ -609,6 +612,7 @@ export interface ProcessFileRequest {
     targetLanguages: LanguagesModel.Language[];
     strings: ProcessFileString[];
     stringsUrl: string;
+    getRawContent?: (encoding: string) => Promise<string>;
 }
 export interface ProcessFileRecord {
     content?: string;
@@ -824,7 +828,7 @@ export interface ApiModule {
 }
 export interface Logger {
     enabled: boolean;
-    log?: (message: string) => void;
+    log?: (message: string, context?: LogContext) => void;
 }
 export interface Pricing {
     planType: 'free' | 'recurring';
@@ -882,7 +886,6 @@ export interface UpdateCrowdinWebhookPayloadsArgs {
     req: Request;
 }
 export interface CreateOrUpdateSyncedFilesArgs {
-    config: Config;
     req: IntegrationRequest;
     fileIds: string[];
 }
@@ -895,7 +898,8 @@ export interface IntegrationSyncedFiles {
 export declare enum UserPermissions {
     OWNER = "owner",
     MANAGERS = "managers",
-    ALL_MEMBERS = "all"
+    ALL_MEMBERS = "all",
+    GUESTS = "guests"
 }
 export declare enum ProjectPermissions {
     OWN = "own",

package/out/models/index.js

@@ -96,6 +96,7 @@ var UserPermissions;
     UserPermissions["OWNER"] = "owner";
     UserPermissions["MANAGERS"] = "managers";
     UserPermissions["ALL_MEMBERS"] = "all";
+    UserPermissions["GUESTS"] = "guests";
 })(UserPermissions = exports.UserPermissions || (exports.UserPermissions = {}));
 var ProjectPermissions;
 (function (ProjectPermissions) {

package/out/storage/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStorage = exports.initialize = void 0;
-const util_1 = require("../util");
+const logger_1 = require("../util/logger");
 const mysql_1 = require("./mysql");
 const postgre_1 = require("./postgre");
 const sqlite_1 = require("./sqlite");
@@ -18,15 +18,15 @@ let storage;
 function initialize(config) {
     return __awaiter(this, void 0, void 0, function* () {
         if (config.postgreConfig) {
-            (0, util_1.log)('Using PostgreSQL database', config.logger);
+            (0, logger_1.log)('Using PostgreSQL database');
             storage = new postgre_1.PostgreStorage(config.postgreConfig);
         }
         else if (config.mysqlConfig) {
-            (0, util_1.log)('Using MySQL database', config.logger);
+            (0, logger_1.log)('Using MySQL database');
             storage = new mysql_1.MySQLStorage(config.mysqlConfig);
         }
         else {
-            (0, util_1.log)('Using SQLite database', config.logger);
+            (0, logger_1.log)('Using SQLite database');
             storage = new sqlite_1.SQLiteStorage({ dbFolder: config.dbFolder });
         }
         yield storage.migrate();

package/out/util/api/api.js

@@ -200,7 +200,7 @@ function addDefaultApiEndpoints(app, config) {
          *                data:
          *                  $ref: '#/components/schemas/FileProgress'
          */
-        app.get('/file-progress', (0, crowdin_client_1.default)(config), (0, crowdin_file_progress_1.default)(config, config.projectIntegration));
+        app.get('/file-progress', (0, crowdin_client_1.default)(config), (0, crowdin_file_progress_1.default)(config.projectIntegration));
         /**
          * @openapi
          * /integration-files:
@@ -222,7 +222,7 @@ function addDefaultApiEndpoints(app, config) {
          *                   $ref: '#/components/schemas/IntegrationFiles'
          *
          */
-        app.get('/integration-files', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, integration_data_1.default)(config, config.projectIntegration));
+        app.get('/integration-files', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, integration_data_1.default)(config.projectIntegration));
         /**
          * @openapi
          * /crowdin-update:
@@ -289,7 +289,7 @@ function addDefaultApiEndpoints(app, config) {
          *                data:
          *                  $ref: '#/components/schemas/SettingsResponse'
          */
-        app.get('/settings', (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, settings_1.default)(config));
+        app.get('/settings', (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, settings_1.default)());
         /**
          * @openapi
          * /settings:
@@ -338,7 +338,7 @@ function addDefaultApiEndpoints(app, config) {
          *                    - { $ref: '#/components/schemas/CrowdinSyncSettingsResponse' }
          *                    - { $ref: '#/components/schemas/IntegrationSyncSettingsResponse' }
          */
-        app.get('/sync-settings', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, sync_settings_1.default)(config));
+        app.get('/sync-settings', json_response_1.default, (0, crowdin_client_1.default)(config), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, sync_settings_1.default)());
         /**
          * @openapi
          * /sync-settings:

package/out/util/connection.d.ts

@@ -1,10 +1,19 @@
 import Crowdin from '@crowdin/crowdin-api-client';
 import { AccountType, Config, CrowdinCredentials, IntegrationCredentials, IntegrationLogic, SubscriptionInfo } from '../models';
-export declare function prepareCrowdinClient(config: Config, credentials: CrowdinCredentials, autoRenew?: boolean): Promise<{
+export declare function prepareCrowdinClient({ config, credentials, autoRenew, }: {
+    config: Config;
+    credentials: CrowdinCredentials;
+    autoRenew?: boolean;
+}): Promise<{
     client: Crowdin;
     token: string;
 }>;
 export declare function prepareIntegrationCredentials(config: Config, integration: IntegrationLogic, integrationCredentials: IntegrationCredentials): Promise<any>;
 export declare function clearCache(organization: string): void;
 export declare function isAppFree(config: Config): boolean;
-export declare function checkSubscription(config: Config, token: string, organization: string, accountType: AccountType): Promise<SubscriptionInfo>;
+export declare function checkSubscription({ config, token, organization, accountType, }: {
+    config: Config;
+    token: string;
+    organization: string;
+    accountType: AccountType;
+}): Promise<SubscriptionInfo>;

package/out/util/connection.js

@@ -20,6 +20,7 @@ const _1 = require(".");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 const axios_2 = require("./axios");
+const logger_1 = require("./logger");
 const axiosCustom = new axios_2.AxiosProvider().axios;
 function refreshToken(config, credentials) {
     var _a, _b;
@@ -53,7 +54,7 @@ function refreshToken(config, credentials) {
         };
     });
 }
-function prepareCrowdinClient(config, credentials, autoRenew = false) {
+function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         //2 min as an extra buffer
@@ -206,9 +207,9 @@ function prepareCrowdinClient(config, credentials, autoRenew = false) {
 exports.prepareCrowdinClient = prepareCrowdinClient;
 function refreshCrowdinCreds({ config, credentials }) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, _1.log)('Crowdin credentials have expired. Requesting a new credentials', config.logger);
+        (0, logger_1.log)('Crowdin credentials have expired. Requesting a new credentials');
         const newCredentials = yield refreshToken(config, credentials);
-        (0, _1.log)('Saving updated crowdin credentials in the database', config.logger);
+        (0, logger_1.log)('Saving updated crowdin credentials in the database');
         const newCrowdinCredentials = {
             id: credentials.id,
             appSecret: credentials.appSecret,
@@ -234,13 +235,13 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
     return __awaiter(this, void 0, void 0, function* () {
         const credentials = JSON.parse((0, _1.decryptData)(config, integrationCredentials.credentials));
         if ((_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.refresh) {
-            (0, _1.log)('Checking if integration credentials need to be refreshed', config.logger);
+            (0, logger_1.log)('Checking if integration credentials need to be refreshed');
             const oauthLogin = integration.oauthLogin;
             const { expireIn } = credentials;
             //2 min as an extra buffer
             const isExpired = expireIn - 120 < Date.now() / 1000;
             if (isExpired) {
-                (0, _1.log)('Integration credentials have expired. Requesting a new credentials', config.logger);
+                (0, logger_1.log)('Integration credentials have expired. Requesting a new credentials');
                 let newCredentials;
                 if (oauthLogin.performRefreshTokenRequest) {
                     newCredentials = yield oauthLogin.performRefreshTokenRequest(credentials);
@@ -264,7 +265,7 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
                 if (newCredentials[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.refreshToken) || 'refresh_token']) {
                     credentials.refreshToken = newCredentials[((_h = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _h === void 0 ? void 0 : _h.refreshToken) || 'refresh_token'];
                 }
-                (0, _1.log)('Saving updated integration credentials in the database', config.logger);
+                (0, logger_1.log)('Saving updated integration credentials in the database');
                 yield (0, storage_1.getStorage)().updateIntegrationCredentials(integrationCredentials.id, (0, _1.encryptData)(config, JSON.stringify(credentials)));
             }
         }
@@ -304,21 +305,21 @@ function validateSubscription(date) {
     const daysLeft = Math.round((date.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
     return { expired, daysLeft };
 }
-function checkSubscription(config, token, organization, accountType) {
+function checkSubscription({ config, token, organization, accountType, }) {
     var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         if (isAppFree(config)) {
             return { expired: false };
         }
-        (0, _1.log)('Checking subscription plan', config.logger);
+        (0, logger_1.log)('Checking subscription plan');
         const appIdentifier = config.identifier;
         const cacheEntry = getFromCache(organization, appIdentifier);
         if (cacheEntry) {
             const { cacheValidUntil, validUntil, subscribeLink, type } = cacheEntry;
             if (cacheValidUntil.getTime() > Date.now()) {
-                (0, _1.log)(`Loaded data from cache. Subscription is valid until ${validUntil.toISOString()}`, config.logger);
+                (0, logger_1.log)(`Loaded data from cache. Subscription is valid until ${validUntil.toISOString()}`);
                 const { expired, daysLeft } = validateSubscription(new Date(validUntil));
-                (0, _1.log)(`expired ${expired}`, config.logger);
+                (0, logger_1.log)(`expired ${expired}`);
                 return { expired, subscribeLink, daysLeft, type };
             }
         }
@@ -329,16 +330,16 @@ function checkSubscription(config, token, organization, accountType) {
                 token,
                 baseUrl: (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.subscriptionUrl,
             });
-            (0, _1.log)(`Recieved subscription info. ${JSON.stringify(subscription)}`, config.logger);
+            (0, logger_1.log)(`Recieved subscription info. ${JSON.stringify(subscription)}`);
             const { expired, daysLeft } = validateSubscription(new Date(subscription.expires));
-            (0, _1.log)(`expired ${expired}`, config.logger);
+            (0, logger_1.log)(`expired ${expired}`);
             addToCache(organization, appIdentifier, new Date(subscription.expires), models_1.SubscriptionInfoType.SUBSCRIPTION, (_b = config.pricing) === null || _b === void 0 ? void 0 : _b.cachingSeconds);
             return { expired, daysLeft, type: models_1.SubscriptionInfoType.SUBSCRIPTION };
         }
         catch (e) {
             if (e instanceof crowdin_apps_functions_1.PaymentRequiredError) {
                 const { initializedAt, subscribeLink } = e;
-                (0, _1.log)(`Recieved 402 payment error. initializedAt ${initializedAt}`, config.logger);
+                (0, logger_1.log)(`Recieved 402 payment error. initializedAt ${initializedAt}`);
                 //default 2 weeks
                 const defaultSubscriptionPlan = 14;
                 let days;
@@ -348,11 +349,11 @@ function checkSubscription(config, token, organization, accountType) {
                 else {
                     days = ((_e = config.pricing) === null || _e === void 0 ? void 0 : _e.trialCrowdin) || ((_f = config.pricing) === null || _f === void 0 ? void 0 : _f.trial) || defaultSubscriptionPlan;
                 }
-                (0, _1.log)(`Subscriptino trial plan ${days} days`, config.logger);
+                (0, logger_1.log)(`Subscriptino trial plan ${days} days`);
                 const date = new Date(initializedAt);
                 date.setDate(date.getDate() + days);
                 const { expired, daysLeft } = validateSubscription(date);
-                (0, _1.log)(`expired ${expired}`, config.logger);
+                (0, logger_1.log)(`expired ${expired}`);
                 addToCache(organization, appIdentifier, new Date(date), models_1.SubscriptionInfoType.TRIAL, (_g = config.pricing) === null || _g === void 0 ? void 0 : _g.cachingSeconds, subscribeLink);
                 return { expired, subscribeLink, daysLeft, type: models_1.SubscriptionInfoType.TRIAL };
             }
@@ -362,7 +363,7 @@ function checkSubscription(config, token, organization, accountType) {
             else {
                 console.error(e);
             }
-            (0, _1.log)('Recieved http error from subscription request. Returning expired=false', config.logger);
+            (0, logger_1.log)('Recieved http error from subscription request. Returning expired=false');
             return { expired: false };
         }
     });

package/out/util/cron.js

@@ -34,21 +34,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrUpdateSyncSettings = exports.skipFoldersFromIntegrationRequest = exports.filesCron = exports.runJob = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
-const _1 = require(".");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 const connection_1 = require("./connection");
 const defaults_1 = require("./defaults");
 const file_snapshot_1 = require("./file-snapshot");
+const logger_1 = require("./logger");
 function runJob(config, integration, job) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, _1.log)(`Starting cron job with expression [${job.expression}]`, config.logger);
+        (0, logger_1.log)(`Starting cron job with expression [${job.expression}]`);
         const crowdinCredentialsList = yield (0, storage_1.getStorage)().getAllCrowdinCredentials();
         yield Promise.all(crowdinCredentialsList.map((crowdinCredentials) => __awaiter(this, void 0, void 0, function* () {
-            const { token, client: crowdinClient } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials, true);
-            const { expired } = yield (0, connection_1.checkSubscription)(config, token, crowdinCredentials.id, crowdinCredentials.type);
+            const { token, client: crowdinClient } = yield (0, connection_1.prepareCrowdinClient)({
+                config,
+                credentials: crowdinCredentials,
+                autoRenew: true,
+            });
+            const { expired } = yield (0, connection_1.checkSubscription)({
+                config,
+                token,
+                organization: crowdinCredentials.id,
+                accountType: crowdinCredentials.type,
+            });
             if (expired) {
-                (0, _1.log)(`Subscription expired. Skipping job [${job.expression}] for organization ${crowdinCredentials.id}`);
+                (0, logger_1.log)(`Subscription expired. Skipping job [${job.expression}] for organization ${crowdinCredentials.id}`);
                 return;
             }
             const integrationCredentialsList = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinCredentials.id);
@@ -57,18 +66,18 @@ function runJob(config, integration, job) {
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
                 const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
                 const intConfig = integrationCredentials.config ? JSON.parse(integrationCredentials.config) : undefined;
-                (0, _1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`, config.logger);
+                (0, logger_1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`);
                 yield job.task(projectId, crowdinClient, apiCredentials, rootFolder, intConfig);
-                (0, _1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`, config.logger);
+                (0, logger_1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`);
             }
         })));
-        (0, _1.log)(`Cron job with expression [${job.expression}] completed`, config.logger);
+        (0, logger_1.log)(`Cron job with expression [${job.expression}] completed`);
     });
 }
 exports.runJob = runJob;
 function filesCron(config, integration, period) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, _1.log)(`Starting files cron job with period [${period}]`, config.logger);
+        (0, logger_1.log)(`Starting files cron job with period [${period}]`);
         const syncSettingsList = yield (0, storage_1.getStorage)().getAllSyncSettingsByType('schedule');
         yield Promise.all(syncSettingsList.map((syncSettings) => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -86,10 +95,19 @@ function filesCron(config, integration, period) {
                 return;
             }
             const projectId = crowdinAppFunctions.getProjectId(integrationCredentials.id);
-            const { client: crowdinClient, token } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials, true);
-            const { expired } = yield (0, connection_1.checkSubscription)(config, token, crowdinCredentials.id, crowdinCredentials.type);
+            const { client: crowdinClient, token } = yield (0, connection_1.prepareCrowdinClient)({
+                config,
+                credentials: crowdinCredentials,
+                autoRenew: true,
+            });
+            const { expired } = yield (0, connection_1.checkSubscription)({
+                config,
+                token,
+                organization: crowdinCredentials.id,
+                accountType: crowdinCredentials.type,
+            });
             if (expired) {
-                (0, _1.log)(`Subscription expired. Skipping job [${period}] for organization ${crowdinCredentials.id}`);
+                (0, logger_1.log)(`Subscription expired. Skipping job [${period}] for organization ${crowdinCredentials.id}`);
                 return;
             }
             const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
@@ -115,10 +133,10 @@ function filesCron(config, integration, period) {
                 const filesToProcess = all
                     ? crowdinFiles
                     : yield getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowdinClient, onlyApproved, onlyTranslated);
-                (0, _1.log)(`Executing updateIntegration task for files cron job with period [${period}] for project ${projectId}.Files ${Object.keys(filesToProcess).length}`, config.logger);
+                (0, logger_1.log)(`Executing updateIntegration task for files cron job with period [${period}] for project ${projectId}.Files ${Object.keys(filesToProcess).length}`);
                 if (!all) {
                     if (Object.keys(filesToProcess).length === 0) {
-                        (0, _1.log)(`There is no ${onlyApproved ? 'approved' : 'translated'} file`, config.logger);
+                        (0, logger_1.log)(`There is no ${onlyApproved ? 'approved' : 'translated'} file`);
                         return;
                     }
                 }
@@ -129,7 +147,7 @@ function filesCron(config, integration, period) {
                     const currentFileSnapshot = yield (0, file_snapshot_1.getCrowdinSnapshot)(config, integration, crowdinClient, projectId, intConfig);
                     yield (0, storage_1.getStorage)().updateFilesSnapshot(JSON.stringify(currentFileSnapshot), syncSettings.integrationId, syncSettings.crowdinId, syncSettings.provider);
                 }
-                (0, _1.log)(`updateIntegration task for files cron job with period [${period}] for project ${projectId} completed`, config.logger);
+                (0, logger_1.log)(`updateIntegration task for files cron job with period [${period}] for project ${projectId} completed`);
             }
             else {
                 const allIntFiles = [...files, ...newFiles].map((file) => (Object.assign({ id: file.id, name: file.name, parentId: file.parent_id || file.parentId, 
@@ -138,7 +156,7 @@ function filesCron(config, integration, period) {
                     // eslint-disable-next-line @typescript-eslint/camelcase
                     node_type: file.nodeType || file.node_type }, (file.type ? { type: file.type } : {}))));
                 const intFiles = allIntFiles.filter((file) => 'type' in file);
-                (0, _1.log)(`Executing updateCrowdin task for files cron job with period [${period}] for project ${projectId}. Files ${intFiles.length}`, config.logger);
+                (0, logger_1.log)(`Executing updateCrowdin task for files cron job with period [${period}] for project ${projectId}. Files ${intFiles.length}`);
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
                 yield integration.updateCrowdin(projectId, crowdinClient, apiCredentials, intFiles, rootFolder, intConfig);
                 const newSyncSettingsFiels = allIntFiles.map((file) => (Object.assign(Object.assign({}, file), { schedule: true, sync: false })));
@@ -147,16 +165,16 @@ function filesCron(config, integration, period) {
                     const currentFileSnapshot = yield (0, file_snapshot_1.getIntegrationSnapshot)(integration, apiCredentials, intConfig);
                     yield (0, storage_1.getStorage)().updateFilesSnapshot(JSON.stringify(currentFileSnapshot), syncSettings.integrationId, syncSettings.crowdinId, syncSettings.provider);
                 }
-                (0, _1.log)(`updateCrowdin task for files cron job with period [${period}] for project ${projectId} completed`, config.logger);
+                (0, logger_1.log)(`updateCrowdin task for files cron job with period [${period}] for project ${projectId} completed`);
             }
         })));
-        (0, _1.log)(`Files cron job with period [${period}] completed`, config.logger);
+        (0, logger_1.log)(`Files cron job with period [${period}] completed`);
     });
 }
 exports.filesCron = filesCron;
 function getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowdinClient, onlyApproved, onlyTranslated) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, _1.log)(`Filtering files to process only ${onlyApproved ? 'approved' : 'translated'} files`, config.logger);
+        (0, logger_1.log)(`Filtering files to process only ${onlyApproved ? 'approved' : 'translated'} files`);
         const filesInfo = yield Promise.all(Object.keys(crowdinFiles).map((fileId) => __awaiter(this, void 0, void 0, function* () {
             const res = yield crowdinClient.translationStatusApi
                 .withFetchAll()
@@ -180,26 +198,26 @@ function getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowd
                 }
                 if (onlyTranslated) {
                     if (languageInfo.translationProgress === 100) {
-                        (0, _1.log)(`File ${fileId} is fully translated for language ${language}`, config.logger);
+                        (0, logger_1.log)(`File ${fileId} is fully translated for language ${language}`);
                         if (!filteredFiles[fileId]) {
                             filteredFiles[fileId] = [];
                         }
                         filteredFiles[fileId].push(language);
                     }
                     else {
-                        (0, _1.log)(`File ${fileId} is not fully translated for language ${language}, progress ${languageInfo.translationProgress}`, config.logger);
+                        (0, logger_1.log)(`File ${fileId} is not fully translated for language ${language}, progress ${languageInfo.translationProgress}`);
                     }
                 }
                 if (onlyApproved) {
                     if (languageInfo.approvalProgress === 100) {
-                        (0, _1.log)(`File ${fileId} is fully approved for language ${language}`, config.logger);
+                        (0, logger_1.log)(`File ${fileId} is fully approved for language ${language}`);
                         if (!filteredFiles[fileId]) {
                             filteredFiles[fileId] = [];
                         }
                         filteredFiles[fileId].push(language);
                     }
                     else {
-                        (0, _1.log)(`File ${fileId} is not fully approved for language ${language}, progress ${languageInfo.approvalProgress}`, config.logger);
+                        (0, logger_1.log)(`File ${fileId} is not fully approved for language ${language}, progress ${languageInfo.approvalProgress}`);
                     }
                 }
             });
@@ -238,11 +256,11 @@ function createOrUpdateSyncSettings(config, req, files, provider, onlyCreate = f
     return __awaiter(this, void 0, void 0, function* () {
         const existingSettings = yield (0, storage_1.getStorage)().getSyncSettings(req.crowdinContext.clientId, req.crowdinContext.crowdinId, 'schedule', provider);
         if (!existingSettings) {
-            (0, _1.log)(`Saving sync settings for type schedule and provider ${provider} ${JSON.stringify(files, null, 2)}`, config.logger);
+            (0, logger_1.log)(`Saving sync settings for type schedule and provider ${provider} ${JSON.stringify(files, null, 2)}`);
             yield (0, storage_1.getStorage)().saveSyncSettings(JSON.stringify(files), req.crowdinContext.clientId, req.crowdinContext.crowdinId, 'schedule', provider);
         }
         else if (!onlyCreate) {
-            (0, _1.log)(`Updating sync settings for type schedule and provider ${provider} ${JSON.stringify(files, null, 2)}`, config.logger);
+            (0, logger_1.log)(`Updating sync settings for type schedule and provider ${provider} ${JSON.stringify(files, null, 2)}`);
             yield (0, storage_1.getStorage)().updateSyncSettings(JSON.stringify(files), req.crowdinContext.clientId, req.crowdinContext.crowdinId, 'schedule', provider);
         }
     });

package/out/util/file-snapshot.d.ts

@@ -1,5 +1,5 @@
-import { Config, GetAllNewFilesArgs, IntegrationLogic, IntegrationRequest, Provider, TreeItem, UpdateIntegrationRequest } from '../models';
 import Crowdin from '@crowdin/crowdin-api-client';
+import { Config, GetAllNewFilesArgs, IntegrationLogic, IntegrationRequest, Provider, TreeItem, UpdateIntegrationRequest } from '../models';
 export declare function getFileDiff(currentFiles: TreeItem[], savedFiles: TreeItem[]): TreeItem[];
 export declare function getAllNewFiles(args: GetAllNewFilesArgs): Promise<TreeItem[] | UpdateIntegrationRequest>;
 export declare function getCrowdinSnapshot(config: Config, integration: IntegrationLogic, crowdinApiClient: Crowdin, projectId: number, integrationSettings: any): Promise<TreeItem[]>;

package/out/util/file-snapshot.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrUpdateFileSnapshot = exports.getIntegrationSnapshot = exports.getCrowdinSnapshot = exports.getAllNewFiles = exports.getFileDiff = void 0;
 const models_1 = require("../models");
-const index_1 = require("./index");
-const defaults_1 = require("./defaults");
 const storage_1 = require("../storage");
+const defaults_1 = require("./defaults");
+const index_1 = require("./index");
 function getFileDiff(currentFiles, savedFiles) {
     return currentFiles.filter((x) => !savedFiles.some((x2) => x2.id === x.id));
 }
@@ -138,11 +138,11 @@ function createOrUpdateFileSnapshot(config, integration, req, provider) {
             files = yield getIntegrationSnapshot(integration, req.integrationCredentials, req.integrationSettings);
         }
         if (existingSnapshot) {
-            (0, index_1.log)(`Updating file snapshot for provider ${provider} ${JSON.stringify(files, null, 2)}`, config.logger);
+            req.logInfo(`Updating file snapshot for provider ${provider} ${JSON.stringify(files, null, 2)}`);
             yield (0, storage_1.getStorage)().updateFilesSnapshot(JSON.stringify(files), req.crowdinContext.clientId, req.crowdinContext.crowdinId, provider);
         }
         else {
-            (0, index_1.log)(`Saving file snapshot for provider ${provider} ${JSON.stringify(files, null, 2)}`, config.logger);
+            req.logInfo(`Saving file snapshot for provider ${provider} ${JSON.stringify(files, null, 2)}`);
             yield (0, storage_1.getStorage)().saveFilesSnapshot(JSON.stringify(files), req.crowdinContext.clientId, req.crowdinContext.crowdinId, provider);
         }
     });

package/out/util/index.d.ts

@@ -1,15 +1,12 @@
 import { Request, Response } from 'express';
-import { Config, ExtendedResult, Logger, ImagePath } from '../models';
+import { Config, CrowdinClientRequest, ExtendedResult, ImagePath } from '../models';
 export declare class CodeError extends Error {
     code: number | undefined;
     constructor(message: string, code?: number);
 }
-export declare function log(message: string, logger?: Logger): void;
-export declare function getMessage(err: any): any;
-export declare function runAsyncWrapper(callback: Function, onError?: (e: any) => void): (req: Request, res: Response, next: Function) => void;
-export declare function logError(e: any, onError?: (e: any) => void): void;
+export declare function runAsyncWrapper(callback: Function): (req: Request | CrowdinClientRequest, res: Response, next: Function) => void;
 export declare function encryptData(config: Config, data: string): string;
 export declare function decryptData(config: Config, data: string): string;
 export declare function executeWithRetry<T>(func: () => Promise<T>, numOfRetries?: number): Promise<T>;
 export declare function isExtendedResultType<T>(data?: T | ExtendedResult<T>): data is ExtendedResult<T>;
-export declare function getLogoUrl(config: Config, moduleConfig?: ImagePath, modulePath?: string): string;
+export declare function getLogoUrl(moduleConfig?: ImagePath, modulePath?: string): string;