@crowdin/app-project-module 0.88.1 → 0.90.0

package/out/index.js

@@ -98,13 +98,11 @@ exports.metadataStore = {
     },
     saveMetadata: (id, metadata, crowdinId) => __awaiter(void 0, void 0, void 0, function* () {
         if (!crowdinId) {
-            console.warn('Warning: The crowdinId parameter in saveMetadata will be required. Please update your code to provide this parameter.');
+            throw new Error('The crowdinId parameter is required.');
         }
-        else {
-            const crowdinCredentials = yield storage.getStorage().getCrowdinCredentials(crowdinId);
-            if (!crowdinCredentials) {
-                console.error('Invalid crowdinId parameter: You can get your crowdinId from the JWT payload');
-            }
+        const crowdinCredentials = yield storage.getStorage().getCrowdinCredentials(crowdinId);
+        if (!crowdinCredentials) {
+            throw new Error('Invalid crowdinId parameter: You can get your crowdinId from the JWT payload.');
         }
         const existing = yield storage.getStorage().getMetadata(id);
         if (existing) {

package/out/middlewares/api-call.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response } from 'express';
+export default function handle(req: Request, _res: Response, next: Function): void;

package/out/middlewares/api-call.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function handle(req, _res, next) {
+    req.isApiCall = true;
+    next();
+}
+exports.default = handle;

package/out/middlewares/crowdin-client.js

@@ -65,7 +65,7 @@ function prepareCrowdinRequest({ jwtToken, config, optional = false, checkSubscr
 exports.prepareCrowdinRequest = prepareCrowdinRequest;
 function handle({ config, optional = false, checkSubscriptionExpiration = true, moduleKey, }) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const jwtToken = getToken(req);
         if (!jwtToken) {
             (0, logger_1.temporaryErrorDebug)('Access denied: crowdin-client', req);
@@ -80,6 +80,13 @@ function handle({ config, optional = false, checkSubscriptionExpiration = true,
                 moduleKey,
             });
             if ((_a = config.api) === null || _a === void 0 ? void 0 : _a.default) {
+                if (req.isApiCall && !((_b = req.body) === null || _b === void 0 ? void 0 : _b.projectId)) {
+                    return res.status(400).json({
+                        error: {
+                            message: 'Missing required parameter: projectId',
+                        },
+                    });
+                }
                 data.context = (0, api_1.updateCrowdinContext)(req, data.context);
             }
             req.crowdinContext = data.context;

package/out/middlewares/integration-credentials.js

@@ -40,6 +40,7 @@ const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-function
 function handle(config, integration, optional = false) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         let clientId = req.crowdinContext.clientId;
+        const isApiCall = req === null || req === void 0 ? void 0 : req.isApiCall;
         const { organization, projectId, userId } = crowdinAppFunctions.parseCrowdinId(clientId);
         req.logInfo(`Loading integration credentials for client ${clientId}`);
         let integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(clientId);
@@ -73,6 +74,13 @@ function handle(config, integration, optional = false) {
                 owners: null,
                 hideActions: false,
             };
+            if (isApiCall) {
+                return res.status(errorOptions.code).json({
+                    error: {
+                        message: errorOptions.message,
+                    },
+                });
+            }
             if (owners) {
                 errorOptions.message = 'Looks like you don’t have access';
                 errorOptions.hideActions = true;
@@ -88,7 +96,17 @@ function handle(config, integration, optional = false) {
         }
         catch (e) {
             console.error(e);
-            throw new util_1.CodeError('Credentials to integration either exprired or invalid', 401);
+            const message = 'Credentials to integration either expired or invalid';
+            if (isApiCall) {
+                return res.status(401).json({
+                    error: {
+                        message,
+                    },
+                });
+            }
+            else {
+                throw new util_1.CodeError(message, 401);
+            }
         }
         const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(clientId);
         if (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config) {

package/out/modules/api/api.js

@@ -10,6 +10,7 @@ const swagger_jsdoc_1 = __importDefault(require("swagger-jsdoc"));
 const crowdin_client_1 = __importDefault(require("../../middlewares/crowdin-client"));
 const integration_credentials_1 = __importDefault(require("../../middlewares/integration-credentials"));
 const json_response_1 = __importDefault(require("../../middlewares/json-response"));
+const api_call_1 = __importDefault(require("../../middlewares/api-call"));
 const crowdin_file_progress_1 = __importDefault(require("../integration/handlers/crowdin-file-progress"));
 const crowdin_files_1 = __importDefault(require("../integration/handlers/crowdin-files"));
 const crowdin_update_1 = __importDefault(require("../integration/handlers/crowdin-update"));
@@ -157,10 +158,7 @@ function getFormFields(fields) {
     const formFields = [];
     for (const field of fields) {
         if (field === null || field === void 0 ? void 0 : field.key) {
-            formFields.push({
-                name: field.label,
-                key: field.key,
-            });
+            formFields.push(Object.assign({ name: field.label, key: field.key, type: field.type }, (field.type === 'select' && field.options ? { options: field.options } : {})));
         }
     }
     return formFields;
@@ -187,7 +185,7 @@ function addDefaultApiEndpoints(app, config) {
          *                 data:
          *                   $ref: '#/components/schemas/CrowdinFiles'
          */
-        app.get('/crowdin-files', json_response_1.default, (0, crowdin_client_1.default)({
+        app.get('/crowdin-files', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -221,12 +219,12 @@ function addDefaultApiEndpoints(app, config) {
          *                data:
          *                  $ref: '#/components/schemas/FileProgress'
          */
-        app.get('/file-progress', (0, crowdin_client_1.default)({
+        app.get('/file-progress', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
             moduleKey: 'file-translation-progress-api',
-        }), (0, crowdin_file_progress_1.default)(config.projectIntegration));
+        }), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, crowdin_file_progress_1.default)(config.projectIntegration));
         /**
          * @openapi
          * /integration-files:
@@ -248,7 +246,7 @@ function addDefaultApiEndpoints(app, config) {
          *                   $ref: '#/components/schemas/IntegrationFiles'
          *
          */
-        app.get('/integration-files', json_response_1.default, (0, crowdin_client_1.default)({
+        app.get('/integration-files', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -276,7 +274,7 @@ function addDefaultApiEndpoints(app, config) {
          *                 data:
          *                  $ref: '#/components/schemas/UpdateResponse'
          */
-        app.post('/crowdin-update', json_response_1.default, (0, crowdin_client_1.default)({
+        app.post('/crowdin-update', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -304,7 +302,7 @@ function addDefaultApiEndpoints(app, config) {
          *                 data:
          *                  $ref: '#/components/schemas/UpdateResponse'
          */
-        app.post('/integration-update', json_response_1.default, (0, crowdin_client_1.default)({
+        app.post('/integration-update', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -334,12 +332,12 @@ function addDefaultApiEndpoints(app, config) {
          *             schema:
          *               $ref: '#/components/schemas/JobResponse'
          */
-        app.get('/jobs', json_response_1.default, (0, crowdin_client_1.default)({
+        app.get('/jobs', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
             moduleKey: 'job-get-api',
-        }), (0, job_info_1.default)(config));
+        }), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, job_info_1.default)(config));
         /**
          * @openapi
          * /jobs:
@@ -352,7 +350,7 @@ function addDefaultApiEndpoints(app, config) {
          *       - $ref: '#/components/parameters/ProjectId'
          *       - name: jobId
          *         in: query
-         *         required: false
+         *         required: true
          *         schema:
          *           type: string
          *           example: 067da473-fc0b-43e3-b0a2-09d26af130c1
@@ -360,12 +358,12 @@ function addDefaultApiEndpoints(app, config) {
          *       204:
          *         description: 'Job canceled successfully'
          */
-        app.delete('/jobs', json_response_1.default, (0, crowdin_client_1.default)({
+        app.delete('/jobs', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
             moduleKey: 'job-cancel-api',
-        }), (0, job_cancel_1.default)(config));
+        }), (0, integration_credentials_1.default)(config, config.projectIntegration), (0, job_cancel_1.default)());
         /**
          * @openapi
          * /settings:
@@ -386,7 +384,7 @@ function addDefaultApiEndpoints(app, config) {
          *                data:
          *                  $ref: '#/components/schemas/SettingsResponse'
          */
-        app.get('/settings', (0, crowdin_client_1.default)({
+        app.get('/settings', api_call_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -409,7 +407,7 @@ function addDefaultApiEndpoints(app, config) {
          *       204:
          *         description: 'Application Settings was successfully update'
          */
-        app.post('/settings', (0, crowdin_client_1.default)({
+        app.post('/settings', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -445,7 +443,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)({
+        app.get('/sync-settings', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -468,7 +466,7 @@ function addDefaultApiEndpoints(app, config) {
          *       204:
          *         description: 'Application Sync Settings was successfully update'
          */
-        app.post('/sync-settings', json_response_1.default, (0, crowdin_client_1.default)({
+        app.post('/sync-settings', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
             config,
             optional: false,
             checkSubscriptionExpiration: true,
@@ -493,12 +491,7 @@ function addDefaultApiEndpoints(app, config) {
              *                data:
              *                  $ref: '#/components/schemas/LoginFieldsResponse'
              */
-            app.get('/login-fields', json_response_1.default, (0, crowdin_client_1.default)({
-                config,
-                optional: false,
-                checkSubscriptionExpiration: true,
-                moduleKey: 'login-data',
-            }), (req, res) => {
+            app.get('/login-fields', api_call_1.default, json_response_1.default, (req, res) => {
                 var _a, _b;
                 let fields = [];
                 if ((_b = (_a = config.projectIntegration) === null || _a === void 0 ? void 0 : _a.loginForm) === null || _b === void 0 ? void 0 : _b.fields) {
@@ -523,7 +516,7 @@ function addDefaultApiEndpoints(app, config) {
              *       204:
              *         description: 'Login successful'
              */
-            app.post('/login', (0, crowdin_client_1.default)({
+            app.post('/login', api_call_1.default, json_response_1.default, (0, crowdin_client_1.default)({
                 config,
                 optional: false,
                 checkSubscriptionExpiration: false,

package/out/modules/api/components.d.ts

@@ -93,9 +93,6 @@
  *        jobId:
  *          type: string
  *          example: '067da473-fc0b-43e3-b0a2-09d26af130c1'
- *        message:
- *          type: string
- *          example: 'Another sync is running'
  *    SettingsData:
  *      type: object
  *      example: {schedule: 0, condition: 0}

package/out/modules/api/components.js

@@ -94,9 +94,6 @@
  *        jobId:
  *          type: string
  *          example: '067da473-fc0b-43e3-b0a2-09d26af130c1'
- *        message:
- *          type: string
- *          example: 'Another sync is running'
  *    SettingsData:
  *      type: object
  *      example: {schedule: 0, condition: 0}

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

@@ -13,6 +13,13 @@ const util_1 = require("../../../util");
 const logger_1 = require("../../../util/logger");
 function handle(integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
+        if (req.isApiCall && !req.params.fileId && !req.body.fileId) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: fileId',
+                },
+            });
+        }
         const fileId = Number(req.params.fileId || req.body.fileId);
         req.logInfo(`Loading translation progress for file ${fileId}`);
         if (integration.getFileProgress) {

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

@@ -30,6 +30,13 @@ function handle(config, integration) {
         if (rootFolder) {
             req.logInfo(`Updating crowdin files under folder ${rootFolder.id}`);
         }
+        if (req.isApiCall && !req.body.files) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: files',
+                },
+            });
+        }
         // A request via API has a different structure
         if (((_b = config.api) === null || _b === void 0 ? void 0 : _b.default) && req.body.files) {
             req.body = req.body.files;

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

@@ -14,10 +14,35 @@ const util_1 = require("../../../util");
 const logger_1 = require("../../../util/logger");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         req.logInfo('Received integration login request');
         let credentials = req.body.credentials;
-        if ((_a = integration.loginForm) === null || _a === void 0 ? void 0 : _a.performGetTokenRequest) {
+        if (req.isApiCall) {
+            if (!credentials) {
+                return res.status(400).json({
+                    error: {
+                        message: 'Missing required parameter: credentials',
+                    },
+                });
+            }
+            if ((_a = integration.loginForm) === null || _a === void 0 ? void 0 : _a.fields) {
+                const missingFields = integration.loginForm.fields
+                    .filter((field) => 'key' in field)
+                    .filter((field) => {
+                    const formField = field;
+                    return formField.type !== 'checkbox' && !credentials[formField.key];
+                })
+                    .map((field) => field.key);
+                if (missingFields.length > 0) {
+                    return res.status(400).json({
+                        error: {
+                            message: `Missing required credential fields: ${missingFields.join(', ')}`,
+                        },
+                    });
+                }
+            }
+        }
+        if ((_b = integration.loginForm) === null || _b === void 0 ? void 0 : _b.performGetTokenRequest) {
             req.logInfo('Performing custom get bearer token request');
             const tokenCredentials = yield integration.loginForm.performGetTokenRequest(credentials);
             credentials = Object.assign(Object.assign({}, credentials), { expireIn: Number(tokenCredentials.expires_in) + Date.now() / 1000, accessToken: tokenCredentials.access_token, refreshToken: tokenCredentials.refresh_token });

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

@@ -17,16 +17,24 @@ const logger_1 = require("../../../util/logger");
 const files_1 = require("../util/files");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         req.logInfo('Updating integration data');
         const client = req.crowdinApiClient;
         const projectId = req.crowdinContext.jwtPayload.context.project_id;
+        const forcePushTranslations = ((_a = req.query) === null || _a === void 0 ? void 0 : _a.forcePushTranslations) === 'true' || !!((_b = req.body) === null || _b === void 0 ? void 0 : _b.forcePushTranslations);
         const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
         if (rootFolder) {
             req.logInfo(`Updating integration data for crowding root folder ${rootFolder.id}`);
         }
+        if (req.isApiCall && !req.body.files) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: files',
+                },
+            });
+        }
         // A request via API has a different structure
-        if (((_a = config.api) === null || _a === void 0 ? void 0 : _a.default) && req.body.files) {
+        if (((_c = config.api) === null || _c === void 0 ? void 0 : _c.default) && req.body.files) {
             req.body = req.body.files;
         }
         let payload = req.body;
@@ -77,6 +85,7 @@ function handle(config, integration) {
                 });
                 throw e;
             }),
+            forcePushTranslations,
         });
     }));
 }

package/out/modules/integration/handlers/job-cancel.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { Config } from '../../../types';
-export default function handle(config: Config): (req: import("../../../types").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 default function handle(): (req: import("../../../types").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/modules/integration/handlers/job-cancel.js

@@ -12,22 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../util/types");
 const util_1 = require("../../../util");
 const storage_1 = require("../../../storage");
-function handle(config) {
+function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const id = req.query.jobId || req.body.jobId;
-        const isApi = (0, util_1.isApiRequest)(req, config);
-        if (isApi && !((_a = req.body) === null || _a === void 0 ? void 0 : _a.projectId)) {
-            res.send({
-                error: 'Project id is require',
-            });
-            return;
-        }
         if (!id) {
-            req.logInfo('Job id is absent');
+            req.logInfo('Job id is missing');
             res.status(400).send('Job id is required');
             return;
         }
+        if (req.isApiCall) {
+            const job = yield (0, storage_1.getStorage)().getJob({ id });
+            if (!job) {
+                return res.status(404).json({
+                    error: {
+                        message: `Job with ID ${id} not found`,
+                    },
+                });
+            }
+        }
         req.logInfo(`User has been canceled the job id: ${id}`);
         yield (0, storage_1.getStorage)().updateJob({ id, status: types_1.JobStatus.CANCELED });
         res.sendStatus(204);

package/out/modules/integration/handlers/job-info.js

@@ -15,6 +15,7 @@ const storage_1 = require("../../../storage");
 const cron_1 = require("../util/cron");
 const defaults_1 = require("../util/defaults");
 const connection_1 = require("../../../util/connection");
+const logger_1 = require("../../../util/logger");
 const MINUTES = 60;
 function getHumanETA(ms) {
     const seconds = Math.floor(ms / 1000);
@@ -35,15 +36,8 @@ function getHumanETA(ms) {
 }
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        const isApi = req.isApiCall;
         const id = req.query.jobId || req.body.jobId;
-        const isApi = (0, util_1.isApiRequest)(req, config);
-        if (isApi && !((_a = req.body) === null || _a === void 0 ? void 0 : _a.projectId)) {
-            res.send({
-                error: 'Project id is require',
-            });
-            return;
-        }
         if (!id) {
             req.logInfo('Get active jobs');
             const jobs = yield (0, storage_1.getStorage)().getActiveJobs({
@@ -67,6 +61,13 @@ function handle(config) {
         }
         req.logInfo(`Get job info for id ${id}`);
         const job = yield (0, storage_1.getStorage)().getJob({ id });
+        if (isApi && !job) {
+            return res.status(404).json({
+                error: {
+                    message: `Job with ID ${id} not found`,
+                },
+            });
+        }
         if (job && job.status === types_1.JobStatus.IN_PROGRESS && job.progress > 5 && job.updatedAt) {
             job.eta = ((Date.now() - job.createdAt) / job.progress) * (100 - job.progress);
             job.info = getHumanETA(job.eta) + (job.info ? `\n${job.info}` : '');
@@ -88,30 +89,47 @@ function handle(config) {
             const integration = config.projectIntegration;
             const crowdinId = req.crowdinContext.crowdinId;
             const integrationId = req.crowdinContext.clientId;
-            const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(integrationId);
-            const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
-            const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(integrationId);
-            const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
-                ? JSON.parse(integrationConfig.config)
-                : { schedule: '0', condition: '0' };
-            const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
-            req.logInfo(`Restarting the job after no updates for more than ${MINUTES} minutes.`);
-            return (0, cron_1.runUpdateProviderJob)({
-                integrationId,
-                crowdinId,
-                type: job.type,
-                title: job.title,
-                payload: JSON.parse(job.payload),
-                jobType: types_1.JobClientType.RERUN,
-                projectId,
-                client: req.crowdinApiClient,
-                integration,
-                context,
-                credentials,
-                rootFolder,
-                appSettings: intConfig,
-                reRunJobId: id,
-            });
+            try {
+                const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(integrationId);
+                const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+                const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(integrationId);
+                const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
+                    ? JSON.parse(integrationConfig.config)
+                    : { schedule: '0', condition: '0' };
+                const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
+                req.logInfo(`Restarting the job after no updates for more than ${MINUTES} minutes.`);
+                return (0, cron_1.runUpdateProviderJob)({
+                    integrationId,
+                    crowdinId,
+                    type: job.type,
+                    title: job.title,
+                    payload: JSON.parse(job.payload),
+                    jobType: types_1.JobClientType.RERUN,
+                    projectId,
+                    client: req.crowdinApiClient,
+                    integration,
+                    context,
+                    credentials,
+                    rootFolder,
+                    appSettings: intConfig,
+                    reRunJobId: id,
+                });
+            }
+            catch (e) {
+                (0, logger_1.logError)(e);
+                yield (0, storage_1.getStorage)().updateJob({
+                    id: job.id,
+                    status: types_1.JobStatus.FAILED,
+                    info: (0, logger_1.getErrorMessage)(e),
+                });
+                return res.status(500).json({
+                    error: {
+                        message: `Job was failed after attempt to restart it due to inactivity (no updates for ${MINUTES} minutes). Please try to restart the job manually.`,
+                        jobId: job.id,
+                        status: types_1.JobStatus.FAILED,
+                    },
+                });
+            }
         }
         req.logInfo(`Returning job info ${JSON.stringify(job, null, 2)}`);
         res.send(job);

package/out/modules/integration/handlers/main.js

@@ -94,6 +94,7 @@ function handle(config, integration) {
         options.integrationSearchListener = integration.integrationSearchListener;
         options.checkSubscription = !(0, subscription_1.isAppFree)(config);
         options.uploadTranslations = integration.uploadTranslations;
+        options.forcePushTranslations = integration.forcePushTranslations;
         options.excludedTargetLanguages = integration.excludedTargetLanguages;
         options.sentryData = process.env.SENTRY_DSN
             ? {

package/out/modules/integration/handlers/settings-save.js

@@ -18,6 +18,13 @@ const cron_1 = require("../util/cron");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const appSettings = req.body.config;
+        if (req.isApiCall && !req.body.config) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: config',
+                },
+            });
+        }
         const clientId = req.crowdinContext.clientId;
         req.logInfo(`Saving settings ${JSON.stringify(appSettings, null, 2)}`);
         const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(clientId);
@@ -38,10 +45,10 @@ function handle(config, integration) {
             });
         }
         else {
-            if (appSettings['new-crowdin-files']) {
+            if (appSettings === null || appSettings === void 0 ? void 0 : appSettings['new-crowdin-files']) {
                 (0, snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, types_1.Provider.CROWDIN);
             }
-            if (appSettings['new-integration-files']) {
+            if (appSettings === null || appSettings === void 0 ? void 0 : appSettings['new-integration-files']) {
                 (0, snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, types_1.Provider.INTEGRATION);
             }
         }

package/out/modules/integration/handlers/sync-settings-save.js

@@ -19,6 +19,7 @@ const snapshot_1 = require("../util/snapshot");
 const files_1 = require("../util/files");
 const job_1 = require("../util/job");
 const types_1 = require("../util/types");
+const types_2 = require("../types");
 function checkAutoSyncSettings(integration, appSettings, provider) {
     var _a;
     return !!(!integration.webhooks && ((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]);
@@ -26,6 +27,22 @@ function checkAutoSyncSettings(integration, appSettings, provider) {
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const { files, provider, expandIntegrationFolders } = req.body;
+        if (req.isApiCall) {
+            if (!files || !provider) {
+                return res.status(400).json({
+                    error: {
+                        message: `Missing required parameter: ${!files ? 'files' : 'provider'}`,
+                    },
+                });
+            }
+            if (!Object.values(types_2.Provider).includes(provider)) {
+                return res.status(400).json({
+                    error: {
+                        message: `Invalid provider. Must be one of: ${Object.values(types_2.Provider).join(', ')}`,
+                    },
+                });
+            }
+        }
         yield (0, job_1.runAsJob)({
             integrationId: req.crowdinContext.clientId,
             crowdinId: req.crowdinContext.crowdinId,

package/out/modules/integration/handlers/sync-settings.js

@@ -15,6 +15,13 @@ 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;
+        if (req.isApiCall && !provider) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: provider',
+                },
+            });
+        }
         req.logInfo(`Loading sync settings for provider ${provider}`);
         const syncSettings = yield (0, storage_1.getStorage)().getSyncSettingsByProvider(req.crowdinContext.clientId, provider);
         if (syncSettings) {

package/out/modules/integration/index.js

@@ -99,7 +99,7 @@ function register({ config, app }) {
         optional: false,
         checkSubscriptionExpiration: true,
         moduleKey: integrationLogic.key,
-    }), (0, job_cancel_1.default)(config));
+    }), (0, job_cancel_1.default)());
     app.post('/api/settings', (0, crowdin_client_1.default)({
         config,
         optional: false,

package/out/modules/integration/types.d.ts

@@ -154,6 +154,10 @@ export interface IntegrationLogic extends ModuleKey {
      * Enable the option to upload translations to crowdin that are already present in the integration.
      */
     uploadTranslations?: boolean;
+    /**
+     * Force sync translations from Crowdin to integration regardless of etag.
+     */
+    forcePushTranslations?: boolean;
     /**
      * Enable the option to upload file for translation into selected languages.
      */

package/out/modules/integration/util/defaults.js

@@ -146,7 +146,7 @@ function applyIntegrationModuleDefaults(config, integration) {
     }
     const getUserSettings = integration.getConfiguration;
     integration.getConfiguration = (projectId, crowdinClient, integrationCredentials) => __awaiter(this, void 0, void 0, function* () {
-        var _m, _o;
+        var _m, _o, _p;
         let fields = [];
         const project = (yield crowdinClient.projectsGroupsApi.getProject(projectId));
         if (getUserSettings) {
@@ -163,42 +163,49 @@ function applyIntegrationModuleDefaults(config, integration) {
             });
         }
         if (integration.withCronSync || integration.webhooks) {
-            defaultSettings.push({
-                key: 'schedule',
-                label: 'Sync schedule',
-                helpText: `Defines how often content is synced between ${config.name} and Crowdin. Make sure Auto Sync is enabled for selected directories and files in the dual pane view.`,
-                type: 'select',
-                defaultValue: '0',
-                category: types_1.DefaultCategory.SYNC,
-                position: 0,
-                options: [
-                    {
-                        value: '0',
-                        label: 'Disabled',
-                    },
-                    {
-                        value: '1',
-                        label: '1 hour',
-                    },
-                    {
-                        value: '3',
-                        label: '3 hours',
-                    },
-                    {
-                        value: '6',
-                        label: '6 hours',
-                    },
-                    {
-                        value: '12',
-                        label: '12 hours',
-                    },
-                    {
-                        value: '24',
-                        label: '24 hours',
-                    },
-                ],
-            });
-            if ((_m = integration.syncNewElements) === null || _m === void 0 ? void 0 : _m.crowdin) {
+            const userSchedule = fields.find((field) => 'key' in field && field.key === 'schedule');
+            if (userSchedule) {
+                userSchedule.position = (_m = userSchedule.position) !== null && _m !== void 0 ? _m : 0;
+                userSchedule.category = types_1.DefaultCategory.SYNC;
+            }
+            else {
+                defaultSettings.push({
+                    key: 'schedule',
+                    label: 'Sync schedule',
+                    helpText: `Defines how often content is synced between ${config.name} and Crowdin. Make sure Auto Sync is enabled for selected directories and files in the dual pane view.`,
+                    type: 'select',
+                    defaultValue: '0',
+                    category: types_1.DefaultCategory.SYNC,
+                    position: 0,
+                    options: [
+                        {
+                            value: '0',
+                            label: 'Disabled',
+                        },
+                        {
+                            value: '1',
+                            label: '1 hour',
+                        },
+                        {
+                            value: '3',
+                            label: '3 hours',
+                        },
+                        {
+                            value: '6',
+                            label: '6 hours',
+                        },
+                        {
+                            value: '12',
+                            label: '12 hours',
+                        },
+                        {
+                            value: '24',
+                            label: '24 hours',
+                        },
+                    ],
+                });
+            }
+            if ((_o = integration.syncNewElements) === null || _o === void 0 ? void 0 : _o.crowdin) {
                 defaultSettings.push({
                     key: 'new-crowdin-files',
                     label: 'Automatically sync new translations from Crowdin',
@@ -208,7 +215,7 @@ function applyIntegrationModuleDefaults(config, integration) {
                     position: 1,
                 });
             }
-            if ((_o = integration.syncNewElements) === null || _o === void 0 ? void 0 : _o.integration) {
+            if ((_p = integration.syncNewElements) === null || _p === void 0 ? void 0 : _p.integration) {
                 defaultSettings.push({
                     key: 'new-integration-files',
                     label: `Automatically sync new content from  ${config.name}`,
@@ -293,7 +300,7 @@ function applyIntegrationModuleDefaults(config, integration) {
     if (!((_b = integration.filtering) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('crowdinLanguages'))) {
         integration.filtering = Object.assign(Object.assign({}, (integration.filtering || {})), { crowdinLanguages: true });
     }
-    integration.filtering.integrationFileStatus = Object.assign({ notSynced: true }, integration.filtering.integrationFileStatus);
+    integration.filtering.integrationFileStatus = Object.assign(Object.assign({}, (integration.integrationOneLevelFetching ? {} : { notSynced: true })), integration.filtering.integrationFileStatus);
     if (!((_c = integration.filtering) === null || _c === void 0 ? void 0 : _c.hasOwnProperty('integrationFilterConfig'))) {
         const filterItems = [
             {

package/out/modules/integration/util/job.d.ts

@@ -2,7 +2,7 @@ import { JobClient, JobClientType, JobStoreType, JobType } from './types';
 import { Response } from 'express';
 import Crowdin from '@crowdin/crowdin-api-client';
 import { Config } from '../../../types';
-export declare function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobStoreType, jobCallback, onError, reRunJobId, }: {
+export declare function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobStoreType, jobCallback, onError, reRunJobId, forcePushTranslations, }: {
     integrationId: string;
     crowdinId: string;
     type: JobType;
@@ -16,5 +16,6 @@ export declare function runAsJob({ integrationId, crowdinId, type, title, payloa
     jobCallback: (arg1: JobClient) => Promise<any>;
     onError?: (e: any) => Promise<void>;
     reRunJobId?: string;
+    forcePushTranslations?: boolean;
 }): Promise<void>;
 export declare function reRunInProgressJobs(config: Config): Promise<void>;

package/out/modules/integration/util/job.js

@@ -48,7 +48,7 @@ const blockingJobs = {
 };
 const maxAttempts = 3;
 const store = {};
-function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobStoreType, jobCallback, onError, reRunJobId, }) {
+function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobStoreType, jobCallback, onError, reRunJobId, forcePushTranslations, }) {
     return __awaiter(this, void 0, void 0, function* () {
         let jobId;
         const storage = (0, storage_1.getStorage)();
@@ -141,7 +141,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                     (0, logger_1.log)(`Receiving translation for file ${fileId} in language ${languageId}`);
                     translation = yield client.translationsApi.buildProjectFileTranslation(projectId, fileId, {
                         targetLanguageId: languageId,
-                    }, (translationCache === null || translationCache === void 0 ? void 0 : translationCache.etag) ? translationCache === null || translationCache === void 0 ? void 0 : translationCache.etag : undefined);
+                    }, (translationCache === null || translationCache === void 0 ? void 0 : translationCache.etag) && !forcePushTranslations ? translationCache === null || translationCache === void 0 ? void 0 : translationCache.etag : undefined);
                     return translation;
                 }
                 catch (e) {

package/out/modules/webhooks/handlers/webhook-handler.js

@@ -69,7 +69,16 @@ function webhookHandler(config, webhooks) {
         const json = JSON.parse(req.body.toString());
         for (const webhook of webhooks) {
             if (webhook.key === moduleKey) {
-                yield webhook.callback({ events: json.events, client });
+                yield webhook.callback({
+                    events: json.events,
+                    client,
+                    webhookContext: {
+                        domain: credentials.domain,
+                        organizationId: credentials.organizationId,
+                        userId: credentials.userId,
+                        agentId: credentials.agentId,
+                    },
+                });
             }
         }
     }));

package/out/modules/webhooks/types.d.ts

@@ -9,10 +9,17 @@ export interface Webhook extends ModuleKey {
      * handle function
      */
     callback: (data: {
+        webhookContext: WebhookContext;
         events: Event[];
         client: Crowdin;
     }) => Promise<void>;
 }
+interface WebhookContext {
+    domain?: string;
+    organizationId?: number;
+    userId?: number;
+    agentId?: number;
+}
 interface EventPayload {
     event: string;
 }

package/out/storage/index.d.ts

@@ -30,8 +30,8 @@ export interface Storage {
     getAllIntegrationCredentials(crowdinId: string): Promise<IntegrationCredentials[]>;
     deleteIntegrationCredentials(id: string): Promise<void>;
     deleteAllIntegrationCredentials(crowdinId: string): Promise<void>;
-    saveMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
-    updateMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
+    saveMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
+    updateMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
     getMetadata(id: string): Promise<any | undefined>;
     getAllMetadata(): Promise<any[] | undefined>;
     deleteMetadata(id: string): Promise<void>;

package/out/storage/mysql.d.ts

@@ -17,6 +17,11 @@ export declare class MySQLStorage implements Storage {
     private _rej?;
     private dbPromise;
     private config;
+    tableIndexes: {
+        [key: string]: {
+            [key: string]: string;
+        };
+    };
     tables: {
         crowdin_credentials: string;
         integration_credentials: string;
@@ -48,7 +53,7 @@ export declare class MySQLStorage implements Storage {
     deleteIntegrationCredentials(id: string): Promise<void>;
     deleteAllIntegrationCredentials(crowdinId: string): Promise<void>;
     saveMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
-    updateMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
+    updateMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
     getMetadata(id: string): Promise<any>;
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;

package/out/storage/mysql.js

@@ -24,6 +24,46 @@ class MySQLStorage {
             this._res = res;
             this._rej = rej;
         });
+        this.tableIndexes = {
+            integration_credentials: {
+                idx_crowdin: '(crowdin_id)',
+            },
+            sync_settings: {
+                idx_integration_provider: '(integration_id, provider)',
+                idx_crowdin: '(crowdin_id)',
+                idx_type: '(type)',
+            },
+            files_snapshot: {
+                idx_integration: '(integration_id)',
+                idx_crowdin: '(crowdin_id)',
+            },
+            webhooks: {
+                idx_integration_crowdin: '(integration_id, crowdin_id)',
+                idx_file_provider: '(file_id, provider)',
+            },
+            user_errors: {
+                idx_integration_crowdin: '(integration_id, crowdin_id)',
+                idx_crowdin: '(crowdin_id)',
+                idx_created_at: '(created_at)',
+            },
+            integration_settings: {
+                idx_integration: '(integration_id)',
+                idx_crowdin: '(crowdin_id)',
+            },
+            job: {
+                idx_integration_crowdin: '(integration_id, crowdin_id)',
+                idx_finished_at: '(finished_at)',
+                idx_status: '(status)',
+            },
+            translation_file_cache: {
+                idx_integration_crowdin_file_language: '(integration_id, crowdin_id, file_id, language_id)',
+                idx_crowdin: '(crowdin_id)',
+            },
+            unsynced_files: {
+                idx_integration_crowdin: '(integration_id, crowdin_id)',
+                idx_crowdin: '(crowdin_id)',
+            },
+        };
         this.tables = {
             crowdin_credentials: `(
             id              varchar(255) primary key,
@@ -168,6 +208,14 @@ class MySQLStorage {
         return __awaiter(this, void 0, void 0, function* () {
             for (const [tableName, tableSchema] of Object.entries(this.tables)) {
                 yield connection.execute(`create table if not exists ${tableName} ${tableSchema}`);
+                if (this.tableIndexes[tableName]) {
+                    for (const [indexName, indexSchema] of Object.entries(this.tableIndexes[tableName])) {
+                        // For MySQL, we need to handle partial indexes differently since MySQL doesn't support WHERE clauses in indexes
+                        // We'll create the basic index without the WHERE clause
+                        const indexColumns = indexSchema.replace(/WHERE.*$/, '').trim();
+                        yield connection.execute(`create index if not exists ${indexName} on ${tableName}${indexColumns}`);
+                    }
+                }
             }
         });
     }

package/out/storage/postgre.d.ts

@@ -62,7 +62,7 @@ export declare class PostgreStorage implements Storage {
     deleteIntegrationCredentials(id: string): Promise<void>;
     deleteAllIntegrationCredentials(crowdinId: string): Promise<void>;
     saveMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
-    updateMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
+    updateMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
     getMetadata(id: string): Promise<any>;
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;

package/out/storage/postgre.js

@@ -197,7 +197,7 @@ class PostgreStorage {
     migrate() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.directoryPath && fs_1.default.existsSync(this.directoryPath)) {
+                if (this.directoryPath && fs_1.default.existsSync(this.directoryPath + '/' + types_1.storageFiles.SQLITE)) {
                     yield this.migrateFromSqlite(this.directoryPath);
                 }
                 yield this.executeQuery((client) => this.addTables(client));

package/out/storage/sqlite.d.ts

@@ -50,8 +50,8 @@ export declare class SQLiteStorage implements Storage {
     getAllIntegrationCredentials(crowdinId: string): Promise<IntegrationCredentials[]>;
     deleteIntegrationCredentials(id: string): Promise<void>;
     deleteAllIntegrationCredentials(crowdinId: string): Promise<void>;
-    saveMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
-    updateMetadata(id: string, metadata: any, crowdinId?: string): Promise<void>;
+    saveMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
+    updateMetadata(id: string, metadata: any, crowdinId: string): Promise<void>;
     getMetadata(id: string): Promise<any>;
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;

package/out/types.d.ts

@@ -328,6 +328,7 @@ export interface CrowdinClientRequest extends Request {
     subscriptionInfo?: SubscriptionInfo;
     logInfo: LogFunction;
     logError: LogErrorFunction;
+    isApiCall?: boolean;
 }
 export interface CrowdinCredentials {
     id: string;
@@ -393,7 +394,7 @@ export interface CrowdinAppUtilities extends CrowdinMetadataStore {
     storage: Storage;
 }
 export interface CrowdinMetadataStore {
-    saveMetadata: (id: string, metadata: any, crowdinId?: string) => Promise<void>;
+    saveMetadata: (id: string, metadata: any, crowdinId: string) => Promise<void>;
     getMetadata: (id: string) => Promise<any | undefined>;
     deleteMetadata: (id: string) => Promise<void>;
     /**

package/out/util/index.d.ts

@@ -14,7 +14,6 @@ export declare function isJson(string: string): boolean;
 export declare function getPreviousDate(days: number): Date;
 export declare function prepareFormDataMetadataId(req: CrowdinClientRequest, config: Config): Promise<string>;
 export declare function validateEmail(email: string | number): boolean;
-export declare function isApiRequest(req: Request, config: Config): boolean;
 export declare function getFormattedDate({ date, userTimezone }: {
     date: Date | number;
     userTimezone: string | undefined;

package/out/util/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormattedDate = exports.isApiRequest = exports.validateEmail = exports.prepareFormDataMetadataId = exports.getPreviousDate = exports.isJson = exports.isAuthorizedConfig = exports.getLogoUrl = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
+exports.getFormattedDate = exports.validateEmail = exports.prepareFormDataMetadataId = exports.getPreviousDate = exports.isJson = 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");
@@ -162,11 +162,6 @@ function validateEmail(email) {
     return emailRegExp.test(String(email).toLowerCase());
 }
 exports.validateEmail = validateEmail;
-function isApiRequest(req, config) {
-    const origin = req.headers['origin'] || req.headers['referer'];
-    return !origin || !origin.includes(config.baseUrl);
-}
-exports.isApiRequest = isApiRequest;
 // Format the date as 'MMM DD, YYYY HH:mm'
 function getFormattedDate({ date, userTimezone }) {
     if (!userTimezone) {

package/out/views/main.handlebars

@@ -89,6 +89,9 @@
                   integration-button-menu-items='[{"label":"Select target languages", "title":"Upload file for translation into selected languages", "action":"excludedTargetLanguages"}]'
               {{/if}}
             {{/if}}
+            {{#if forcePushTranslations}}
+                crowdin-button-menu-items='[{"label":"Force Sync Translations", "action":"forcePushTranslations"}]'
+            {{/if}}
             {{#if filtering.crowdinLanguages}}
               crowdin-filter
             {{/if}}
@@ -862,18 +865,28 @@
         }
     }
 
-    function uploadFilesToIntegration(e) {
-        if (Object.keys(e.detail).length === 0) {
+    function uploadFilesToIntegration(event) {
+        let files = {};
+        let forcePushTranslations = false;
+        if (event.detail?.action === 'forcePushTranslations') {
+          files = event.detail.files;
+          forcePushTranslations = true;
+        } else {
+          files = event.detail;
+        }
+
+        if (Object.keys(event.detail).length === 0 || !event.detail) {
             showToast('Select files which will be uploaded to {{name}}');
             return;
         }
+
         appComponent.setAttribute('is-to-integration-process', true);
         const req = {};
-        Object.keys(e.detail)
+        Object.keys(files)
             .filter(id => crowdinData.find(c => c.id === id).node_type === fileType)
-            .forEach(id => (req[id] = e.detail[id]));
+            .forEach(id => (req[id] = files[id]));
         checkOrigin()
-            .then(restParams => fetch('api/integration/update' + restParams, {
+            .then(restParams => fetch(`api/integration/update${restParams}&forcePushTranslations=${forcePushTranslations}`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(req)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.88.1",
+  "version": "0.90.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",