@crowdin/app-project-module 0.65.0 → 0.65.2

package/out/storage/mysql.js

@@ -608,8 +608,8 @@ class MySQLStorage {
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
                     title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
-                WHERE status = ? AND finished_at is NULL
-                `, [types_1.JobStatus.IN_PROGRESS]);
+                WHERE status IN (?, ?) AND finished_at is NULL
+                `, [types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED]);
                 return rows || [];
             }));
         });

package/out/storage/postgre.js

@@ -640,8 +640,8 @@ class PostgreStorage {
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
                     title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
-                WHERE status = $1 AND finished_at is NULL
-                `, [types_1.JobStatus.IN_PROGRESS]);
+                WHERE status IN ($1, $2) AND finished_at is NULL
+                `, [types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED]);
                 return (res === null || res === void 0 ? void 0 : res.rows) || [];
             }));
         });

package/out/storage/sqlite.js

@@ -612,8 +612,8 @@ class SQLiteStorage {
             return this.each(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
-                WHERE status = ? AND finished_at is NULL
-            `, [types_1.JobStatus.IN_PROGRESS]);
+                WHERE status IN (?,?) AND finished_at is NULL
+            `, [types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED]);
         });
     }
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag }) {

package/out/util/credentials-masker.d.ts

@@ -1,6 +1,9 @@
 /// <reference types="qs" />
 import { CrowdinClientRequest, UiModule } from '../types';
 import { Request, Response } from 'express';
-declare function getRequestCredentialsMasker(moduleConfig?: UiModule): (req: Request | CrowdinClientRequest, res: Response, next: Function) => any;
+declare function getRequestCredentialsMasker({ moduleConfig, dataPath, }: {
+    moduleConfig?: UiModule;
+    dataPath?: string;
+}): (req: Request | CrowdinClientRequest, res: Response, next: Function) => any;
 declare function postRequestCredentialsMasker(moduleConfig?: UiModule, credentialsExtractor?: Function): (req: 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;
 export { getRequestCredentialsMasker, postRequestCredentialsMasker };

package/out/util/credentials-masker.js

@@ -32,7 +32,7 @@ function getMaskableFieldsKeys(moduleConfig) {
         return (0, lodash_get_1.default)(moduleConfig, `formUiSchema[${fieldKey}]['ui:widget']`) === 'password';
     });
 }
-function getRequestCredentialsMasker(moduleConfig) {
+function getRequestCredentialsMasker({ moduleConfig, dataPath = 'formData', }) {
     return function (req, res, next) {
         // we can't find "password" fields without ui schema
         if (!moduleConfig || !moduleConfig.formSchema || !moduleConfig.formUiSchema) {
@@ -48,13 +48,18 @@ function getRequestCredentialsMasker(moduleConfig) {
         }
         const originalSend = res.send;
         res.send = function (body) {
-            if (body.formData) {
+            const maskFields = (target) => {
                 maskableFieldsKeys.forEach((fieldKey) => {
-                    if (!body.formData[fieldKey]) {
-                        return;
+                    if (target[fieldKey]) {
+                        target[fieldKey] = maskKey(target[fieldKey]);
                     }
-                    body.formData[fieldKey] = maskKey(body.formData[fieldKey]);
                 });
+            };
+            if (body[dataPath]) {
+                maskFields(body[dataPath]);
+            }
+            if (dataPath === '') {
+                maskFields(body);
             }
             return originalSend.apply(res, [body]);
         };
@@ -98,7 +103,7 @@ function postRequestCredentialsMasker(moduleConfig, credentialsExtractor) {
             return acc;
         }, {}));
         // run getRequestCredentialsMasker to mask fields that can be in response
-        return getRequestCredentialsMasker(moduleConfig)(req, res, next);
+        return getRequestCredentialsMasker({ moduleConfig })(req, res, next);
     }));
 }
 exports.postRequestCredentialsMasker = postRequestCredentialsMasker;

package/out/util/index.d.ts

@@ -13,3 +13,4 @@ export declare function isAuthorizedConfig(config: Config | UnauthorizedConfig):
 export declare function hasFormSchema(moduleConfig: any): boolean;
 export declare function isJson(string: string): boolean;
 export declare function getPreviousDate(days: number): Date;
+export declare function prepareFormDataMetadataId(req: CrowdinClientRequest, config: Config): Promise<string>;

package/out/util/index.js

@@ -32,11 +32,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreviousDate = exports.isJson = exports.hasFormSchema = exports.isAuthorizedConfig = exports.getLogoUrl = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
+exports.prepareFormDataMetadataId = exports.getPreviousDate = exports.isJson = exports.hasFormSchema = exports.isAuthorizedConfig = exports.getLogoUrl = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
 const crypto = __importStar(require("crypto-js"));
 const storage_1 = require("../storage");
 const types_1 = require("../types");
 const logger_1 = require("./logger");
+const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
 class CodeError extends Error {
     constructor(message, code) {
         super(message);
@@ -142,3 +143,19 @@ function getPreviousDate(days) {
     return date;
 }
 exports.getPreviousDate = getPreviousDate;
+function prepareFormDataMetadataId(req, config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const jwtToken = req.query.jwtToken;
+        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret, config.jwtValidationOptions);
+        const context = jwtPayload.context;
+        const id = ['form-data'];
+        if (context.organization_id) {
+            id.push(`${context.organization_id}`);
+        }
+        if (context.project_id) {
+            id.push(`${context.project_id}`);
+        }
+        return id.join('-');
+    });
+}
+exports.prepareFormDataMetadataId = prepareFormDataMetadataId;

package/out/util/terminus-express.js

@@ -9,10 +9,17 @@ const job_1 = require("../modules/integration/util/job");
 express_1.default.application.baseListen = express_1.default.application.listen;
 express_1.default.application.listen = function (...args) {
     const [config, callback] = args;
-    const server = this.baseListen.call(this, config.port);
+    let port;
+    if (typeof config === 'object') {
+        port = config.port;
+        (0, job_1.reRunInProgressJobs)(config);
+    }
+    else {
+        port = config;
+    }
+    const server = this.baseListen.call(this, port);
     if (callback) {
         callback();
-        (0, job_1.reRunInProgressJobs)(config);
     }
     (0, terminus_1.createTerminus)(server, {
         timeout: Infinity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.65.0",
+  "version": "0.65.2",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -20,10 +20,10 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.606.0",
     "@aws-sdk/s3-request-presigner": "^3.598.0",
-    "@crowdin/crowdin-apps-functions": "0.8.0",
+    "@crowdin/crowdin-apps-functions": "0.8.1",
     "@crowdin/logs-formatter": "^2.1.4",
     "@godaddy/terminus": "^4.12.1",
-    "amqplib": "^0.10.3",
+    "amqplib": "^0.10.4",
     "crypto-js": "^4.2.0",
     "express": "4.19.2",
     "express-handlebars": "^5.3.5",
@@ -41,17 +41,17 @@
     "@babel/preset-react": "^7.24.7",
     "@emotion/react": "^11.13.0",
     "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.16.6",
-    "@mui/material": "^5.16.6",
-    "@rjsf/core": "^5.19.4",
-    "@rjsf/mui": "^5.19.4",
+    "@mui/icons-material": "^5.16.7",
+    "@mui/material": "^5.16.7",
+    "@rjsf/core": "^5.20.1",
+    "@rjsf/mui": "^5.20.1",
     "@rjsf/utils": "^5.18.4",
-    "@rjsf/validator-ajv8": "^5.19.4",
+    "@rjsf/validator-ajv8": "^5.20.1",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^24.1.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-terser": "^0.4.3",
     "@types/amqplib": "^0.10.4",
     "@types/crypto-js": "^4.2.2",