@crowdin/app-project-module 0.33.0 → 0.34.2

package/out/index.js

@@ -39,6 +39,7 @@ exports.createApp = exports.addCrowdinEndpoints = exports.express = exports.User
 const express_handlebars_1 = __importDefault(require("express-handlebars"));
 const cron = __importStar(require("node-cron"));
 const path_1 = require("path");
+const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
 const translate_1 = __importDefault(require("./handlers/custom-mt/translate"));
 const custom_file_format_1 = __importDefault(require("./handlers/file-processing/custom-file-format"));
 const file_download_1 = __importDefault(require("./handlers/file-processing/file-download"));
@@ -96,6 +97,10 @@ function addCrowdinEndpoints(app, clientConfig) {
     storage.initialize(config);
     logger.initialize(config);
     app.use(terminus_express_1.default.json({ limit: '50mb' }));
+    if (!config.disableLogsFormatter) {
+        logsFormatter.setup();
+        app.use(logsFormatter.expressMiddleware());
+    }
     app.use('/assets', terminus_express_1.default.static((0, path_1.join)(__dirname, 'static')));
     app.set('views', (0, path_1.join)(__dirname, 'views'));
     app.engine('handlebars', (0, express_handlebars_1.default)({

package/out/middlewares/crowdin-client.js

@@ -25,13 +25,8 @@ function prepareCrowdinRequest(jwtToken, config, optional = false, checkSubscrip
             clientId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),
             crowdinId: `${jwtPayload.domain || jwtPayload.context.organization_id}`,
         };
-        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);
+        const logInfo = (0, logger_1.withContext)(context);
+        const logError = (0, logger_1.withContextError)(context);
         logInfo('Loading crowdin credentials');
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(context.crowdinId);
         if (!credentials) {
@@ -41,7 +36,7 @@ function prepareCrowdinRequest(jwtToken, config, optional = false, checkSubscrip
             throw new Error("Can't find organization by id");
         }
         logInfo('Building crowdin client instance');
-        const { client, token } = yield (0, connection_1.prepareCrowdinClient)({ config, credentials });
+        const { client, token } = yield (0, connection_1.prepareCrowdinClient)({ config, credentials, autoRenew: true });
         let subscriptionInfo;
         if (checkSubscriptionExpiration) {
             subscriptionInfo = yield (0, connection_1.checkSubscription)({

package/out/middlewares/ui-module.js

@@ -28,9 +28,9 @@ function handle(config, allowUnauthorized = false) {
         const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret, config.jwtValidationOptions);
         const id = `${jwtPayload.domain || jwtPayload.context.organization_id}`;
         const logInfo = (0, logger_1.withContext)({
-            orgId: id,
-            userId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),
-            projectId: jwtPayload.context.project_id,
+            jwtPayload,
+            clientId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),
+            crowdinId: id,
         });
         logInfo('Loading crowdin credentials');
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(id);

package/out/models/index.d.ts

@@ -3,7 +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';
+import { LogErrorFunction, LogFunction } from '../util/logger';
 export interface ClientConfig extends ImagePath {
     /**
      * Authentication Crowdin App type: "authorization_code", "crowdin_app". Default: "crowdin_app"
@@ -131,7 +131,7 @@ export interface ClientConfig extends ImagePath {
     /**
      * Error interceptor (can be used to log error in centralized place)
      */
-    onError?: (error: any, context?: LogContext) => void;
+    onError?: (error: any, context?: CrowdinContextInfo) => void;
     /**
      * Disable global error handling of unhandledRejection and uncaughtException events
      */
@@ -152,6 +152,10 @@ export interface ClientConfig extends ImagePath {
      * sentry dsn identifier of sentry project
      */
     sentryDsn?: string;
+    /**
+     * Disable formatting logs
+     */
+    disableLogsFormatter?: boolean;
 }
 export type Config = ClientConfig & {
     baseUrl: string;
@@ -834,7 +838,7 @@ export interface ApiModule {
 }
 export interface Logger {
     enabled: boolean;
-    log?: (message: string, context?: LogContext) => void;
+    log?: (message: string, context?: CrowdinContextInfo) => void;
 }
 export interface Pricing {
     planType: 'free' | 'recurring';