@crowdin/app-project-module 0.108.0 → 1.0.1

package/out/modules/integration/handlers/crowdin-files-target-languages.js

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("../../../util");
+const logger_1 = require("../../../util/logger");
+const files_1 = require("../util/files");
+const defaults_1 = require("../util/defaults");
+const job_1 = require("../util/job");
+const types_1 = require("../util/types");
+function handle(config, integration) {
+    return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
+        const projectId = req.crowdinContext.jwtPayload.context.project_id;
+        req.logInfo(`Updating target languages for Crowdin files in project ${projectId}`);
+        const { fileIds, languages } = req.body;
+        if (!fileIds || !Array.isArray(fileIds) || fileIds.length === 0) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: fileIds',
+                },
+            });
+        }
+        if (!languages || !Array.isArray(languages) || languages.length === 0) {
+            return res.status(400).json({
+                error: {
+                    message: 'Missing required parameter: languages',
+                },
+            });
+        }
+        if (!integration.updateFilesTargetLanguages) {
+            return res.status(400).json({
+                error: {
+                    message: 'Update files target languages is not supported',
+                },
+            });
+        }
+        const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
+        let options = {};
+        if (rootFolder) {
+            options = {
+                directoryId: rootFolder.id,
+                recursion: 'true',
+            };
+        }
+        const allFiles = yield req.crowdinApiClient.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options);
+        const fileIdsSet = new Set(fileIds);
+        const validFileIds = allFiles.data
+            .map((f) => f.data)
+            .filter((file) => fileIdsSet.has(file.id))
+            .map((file) => file.id);
+        if (validFileIds.length === 0) {
+            return res.status(400).json({
+                error: {
+                    message: 'No valid files found. Directories and branches cannot have target languages updated.',
+                },
+            });
+        }
+        req.logInfo(`Filtered ${fileIds.length} items to ${validFileIds.length} valid files (excluded ${fileIds.length - validFileIds.length} directories/branches)`);
+        const excludedTargetLanguages = yield (0, files_1.getExcludedTargetLanguages)({
+            client: req.crowdinApiClient,
+            projectId,
+            languages,
+        });
+        yield (0, job_1.runAsJob)({
+            integrationId: req.crowdinContext.clientId,
+            crowdinId: req.crowdinContext.crowdinId,
+            type: types_1.JobType.UPDATE_TARGET_LANGUAGES,
+            title: 'Update files target languages',
+            payload: validFileIds,
+            res,
+            projectId,
+            client: req.crowdinApiClient,
+            jobType: types_1.JobClientType.MANUAL,
+            jobStoreType: integration.jobStoreType,
+            jobCallback: () => __awaiter(this, void 0, void 0, function* () {
+                yield integration.updateFilesTargetLanguages({
+                    projectId,
+                    client: req.crowdinApiClient,
+                    fileIds: validFileIds,
+                    excludedTargetLanguages,
+                });
+                return { message: `Successfully updated target languages for ${validFileIds.length} files` };
+            }),
+            onError: (e) => __awaiter(this, void 0, void 0, function* () {
+                yield (0, logger_1.handleUserError)({
+                    action: 'Update files target languages',
+                    error: e,
+                    crowdinId: req.crowdinContext.crowdinId,
+                    clientId: req.crowdinContext.clientId,
+                });
+                throw e;
+            }),
+        });
+    }));
+}
+exports.default = handle;

package/out/modules/integration/handlers/crowdin-files.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (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(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -23,7 +23,13 @@ function handle(config, integration) {
             req.logInfo(`Loading files ${rootFolder ? `from folder ${rootFolder.id}` : 'from root'}`);
             try {
                 let files = integration.getCrowdinFiles
-                    ? yield integration.getCrowdinFiles(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, rootFolder, req.integrationSettings, mode)
+                    ? yield integration.getCrowdinFiles({
+                        projectId: req.crowdinContext.jwtPayload.context.project_id,
+                        client: req.crowdinApiClient,
+                        rootFolder,
+                        settings: req.integrationSettings,
+                        mode: mode,
+                    })
                     : [];
                 req.logInfo('Marking files as unsynced');
                 if (files.length > 0 && mode !== 'directories') {

package/out/modules/integration/handlers/crowdin-project.d.ts

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

package/out/modules/integration/handlers/crowdin-update.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (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(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -8,24 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
 const types_1 = require("../util/types");
 const util_1 = require("../../../util");
 const defaults_1 = require("../util/defaults");
 const logger_1 = require("../../../util/logger");
 const job_1 = require("../util/job");
 const files_1 = require("../util/files");
+const logger_2 = require("../../../util/logger");
 const types_2 = require("../types");
+const storage_1 = require("../../../storage");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const projectId = req.crowdinContext.jwtPayload.context.project_id || (req === null || req === void 0 ? void 0 : req.body.projectId);
         const uploadTranslations = req.query.uploadTranslations === 'true' || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.uploadTranslations);
         const forcePushSources = req.query.forcePushSources === 'true' || ((_b = req.body) === null || _b === void 0 ? void 0 : _b.forcePushSources);
+        const matchFromCrowdin = req.query.matchFromCrowdin === 'true';
         req.logInfo(`Updating crowdin project ${projectId}`);
         const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
         if (rootFolder) {
@@ -43,6 +42,32 @@ function handle(config, integration) {
             req.body = req.body.files;
         }
         let payload = req.body;
+        const matchingWarnings = [];
+        // If matchFromCrowdin is true, we need to match Crowdin files to integration files first
+        if (matchFromCrowdin && integration.matchCrowdinFilesToIntegrationFiles) {
+            const crowdinFiles = req.body;
+            const syncedData = yield (0, storage_1.getStorage)().getSyncedData(req.crowdinContext.clientId, req.crowdinContext.crowdinId, types_2.Provider.INTEGRATION);
+            // Let critical errors bubble up naturally
+            const matchingResult = yield integration.matchCrowdinFilesToIntegrationFiles({
+                projectId,
+                client: req.crowdinApiClient,
+                credentials: req.integrationCredentials,
+                crowdinFiles,
+                settings: req.integrationSettings,
+                rootFolder,
+                syncedData: (syncedData === null || syncedData === void 0 ? void 0 : syncedData.files) ? JSON.parse(syncedData.files) : [],
+            });
+            if ((0, files_1.isMatchingResultType)(matchingResult)) {
+                payload = matchingResult.data;
+                if (matchingResult.errors && matchingResult.errors.length > 0) {
+                    matchingWarnings.push(...matchingResult.errors);
+                    req.logInfo(`File matching completed with ${matchingResult.errors.length} warning(s). ${Array.isArray(payload) ? payload.length : Object.keys(payload).length} file(s) matched successfully and will be synced.`);
+                }
+            }
+            else {
+                payload = matchingResult;
+            }
+        }
         const excludedTargetLanguages = yield (0, files_1.getExcludedTargetLanguages)({
             client: req.crowdinApiClient,
             projectId,
@@ -62,7 +87,7 @@ function handle(config, integration) {
             jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                 if (payload && (payload === null || payload === void 0 ? void 0 : payload.length)) {
                     payload = yield (0, files_1.expandFilesTree)(payload, req, integration, job);
-                    payload = (0, lodash_uniqby_1.default)(payload, 'id');
+                    payload = (0, util_1.uniqBy)(payload, 'id');
                 }
                 if (integration.forcePushSources === true && !forcePushSources && (payload === null || payload === void 0 ? void 0 : payload.length)) {
                     payload = yield (0, files_1.filterSyncedData)(payload);
@@ -73,7 +98,7 @@ function handle(config, integration) {
                     credentials: req.integrationCredentials,
                     request: payload,
                     rootFolder,
-                    appSettings: req.integrationSettings,
+                    settings: req.integrationSettings,
                     uploadTranslations,
                     job,
                     excludedTargetLanguages: req.query.languages ? excludedTargetLanguages : undefined,
@@ -90,11 +115,21 @@ function handle(config, integration) {
                     throw errors.toString();
                 }
                 try {
-                    yield (0, files_1.updateSyncedData)(req.crowdinContext.clientId, req.crowdinContext.crowdinId, payload, types_2.Provider.INTEGRATION);
+                    let syncedDataPayload = payload;
+                    if (currentJob === null || currentJob === void 0 ? void 0 : currentJob.processedEntities) {
+                        syncedDataPayload = JSON.parse(currentJob.processedEntities);
+                    }
+                    yield (0, files_1.updateSyncedData)(req.crowdinContext.clientId, req.crowdinContext.crowdinId, syncedDataPayload, types_2.Provider.INTEGRATION);
                 }
                 catch (e) {
                     (0, logger_1.logError)(e, req.crowdinContext);
                 }
+                if (matchingWarnings.length > 0) {
+                    req.logInfo(`Sync completed with warnings: ${matchingWarnings.length} file(s) could not be matched.`);
+                    const error = new logger_2.AppModuleAggregateError(matchingWarnings, 'Finished with errors. See error logs.');
+                    error.isPartialSuccess = true;
+                    throw error;
+                }
                 let message;
                 if ((0, files_1.isExtendedResultType)(result)) {
                     message = result.message;
@@ -102,23 +137,29 @@ function handle(config, integration) {
                 return { message };
             }),
             onError: (e, job) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const currentJob = yield job.get();
-                    if (currentJob === null || currentJob === void 0 ? void 0 : currentJob.processedEntities) {
-                        const processedEntities = JSON.parse(currentJob.processedEntities);
-                        yield (0, files_1.updateSyncedData)(req.crowdinContext.clientId, req.crowdinContext.crowdinId, processedEntities, types_2.Provider.INTEGRATION);
+                const isPartialSuccess = (e === null || e === void 0 ? void 0 : e.isPartialSuccess) === true;
+                if (!isPartialSuccess) {
+                    try {
+                        const currentJob = yield job.get();
+                        if (currentJob === null || currentJob === void 0 ? void 0 : currentJob.processedEntities) {
+                            const processedEntities = JSON.parse(currentJob.processedEntities);
+                            yield (0, files_1.updateSyncedData)(req.crowdinContext.clientId, req.crowdinContext.crowdinId, processedEntities, types_2.Provider.INTEGRATION);
+                        }
+                    }
+                    catch (syncError) {
+                        (0, logger_1.logError)(syncError, req.crowdinContext);
                     }
                 }
-                catch (syncError) {
-                    (0, logger_1.logError)(syncError, req.crowdinContext);
-                }
+                const errorToLog = !isPartialSuccess && matchingWarnings.length > 0
+                    ? new logger_2.AppModuleAggregateError([e, ...matchingWarnings], 'Sync failed with multiple errors')
+                    : e;
                 yield (0, logger_1.handleUserError)({
-                    action: 'Sync files to Crowdin',
-                    error: e,
+                    action: isPartialSuccess ? 'File matching warnings' : 'Sync files to Crowdin',
+                    error: errorToLog,
                     crowdinId: req.crowdinContext.crowdinId,
                     clientId: req.crowdinContext.clientId,
                 });
-                throw e;
+                throw errorToLog;
             }),
         });
     }));

package/out/modules/integration/handlers/crowdin-webhook.d.ts

@@ -2,4 +2,4 @@
 import { Request, Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../../types").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 default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -19,7 +19,7 @@ const files_1 = require("../util/files");
 function filterSyncFiles(args) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectId, crowdinClient, events, syncFileSettings, appSettings } = args;
+        const { projectId, client, events, syncFileSettings, settings } = args;
         const files = {};
         let projectData;
         const addFileToResponse = (fileId, languages) => {
@@ -34,9 +34,9 @@ function filterSyncFiles(args) {
             const fileId = event.fileId;
             const language = event.language;
             // sync all new files
-            if (event.event === webhooks_1.HookEvents.fileAdded && appSettings['new-crowdin-files']) {
+            if (event.event === webhooks_1.HookEvents.fileAdded && settings['new-crowdin-files']) {
                 if (!projectData) {
-                    projectData = yield crowdinClient.projectsGroupsApi.getProject(projectId);
+                    projectData = yield client.projectsGroupsApi.getProject(projectId);
                 }
                 const projectLanguages = projectData.data.targetLanguageIds;
                 if (projectData.data.inContext) {
@@ -54,7 +54,7 @@ function filterSyncFiles(args) {
             }
             else {
                 try {
-                    const crowdinFile = yield crowdinClient.sourceFilesApi.getFile(projectId, fileId);
+                    const crowdinFile = yield client.sourceFilesApi.getFile(projectId, fileId);
                     // sync file that in selected for sync schedule directory
                     if (syncFileSettings[(_a = crowdinFile === null || crowdinFile === void 0 ? void 0 : crowdinFile.data) === null || _a === void 0 ? void 0 : _a.directoryId] &&
                         syncFileSettings[(_b = crowdinFile === null || crowdinFile === void 0 ? void 0 : crowdinFile.data) === null || _b === void 0 ? void 0 : _b.directoryId].includes(language)) {
@@ -76,7 +76,7 @@ function handle(config, integration) {
         const webhookUrlParam = req.query[urlParam];
         let filesToSync;
         if (webhookUrlParam) {
-            const { projectId, crowdinClient, rootFolder, appSettings, syncSettings } = yield (0, webhooks_1.prepareWebhookData)({
+            const { projectId, crowdinClient, rootFolder, settings, syncSettings } = yield (0, webhooks_1.prepareWebhookData)({
                 config,
                 integration,
                 webhookUrlParam,
@@ -91,15 +91,22 @@ function handle(config, integration) {
             }
             const syncFileSettings = (0, files_1.prepareSyncFiles)(JSON.parse(syncSettings.files));
             if ((_b = integration.webhooks) === null || _b === void 0 ? void 0 : _b.crowdinWebhookInterceptor) {
-                filesToSync = yield integration.webhooks.crowdinWebhookInterceptor(projectId, crowdinClient.client, rootFolder, appSettings, syncSettings, req.body);
+                filesToSync = yield integration.webhooks.crowdinWebhookInterceptor({
+                    projectId,
+                    client: crowdinClient.client,
+                    rootFolder,
+                    settings,
+                    syncSettings,
+                    webhookRequest: req.body,
+                });
             }
             else {
                 filesToSync = yield filterSyncFiles({
                     projectId,
-                    crowdinClient: crowdinClient.client,
+                    client: crowdinClient.client,
                     events: req.body.events,
                     syncFileSettings,
-                    appSettings,
+                    settings,
                 });
             }
             for (const eventPayload of req.body.events) {

package/out/modules/integration/handlers/integration-data.d.ts

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

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

@@ -24,9 +24,16 @@ function handle(integration) {
         let files = [];
         const { crowdinId, clientId } = req.crowdinContext;
         try {
-            const appSettings = req.integrationSettings;
+            const settings = req.integrationSettings;
             const parsedPaginationData = paginationData ? JSON.parse(paginationData) : undefined;
-            const result = yield integration.getIntegrationFiles(req.integrationCredentials, appSettings, parentId, search, page, parsedPaginationData);
+            const result = yield integration.getIntegrationFiles({
+                credentials: req.integrationCredentials,
+                settings,
+                parentId,
+                search,
+                page,
+                paginationData: parsedPaginationData,
+            });
             if ((0, files_1.isExtendedResultType)(result)) {
                 files = result.data || [];
                 message = result.message;
@@ -35,13 +42,13 @@ function handle(integration) {
             else {
                 files = result || [];
             }
-            if ((appSettings === null || appSettings === void 0 ? void 0 : appSettings.skipIntegrationNodesToggle) === true ||
-                ((appSettings === null || appSettings === void 0 ? void 0 : appSettings.skipIntegrationNodesToggle) === undefined && ((_a = integration.skipIntegrationNodesToggle) === null || _a === void 0 ? void 0 : _a.value))) {
+            if ((settings === null || settings === void 0 ? void 0 : settings.skipIntegrationNodesToggle) === true ||
+                ((settings === null || settings === void 0 ? void 0 : settings.skipIntegrationNodesToggle) === undefined && ((_a = integration.skipIntegrationNodesToggle) === null || _a === void 0 ? void 0 : _a.value))) {
                 files = (0, files_1.skipFilesByRegex)(files, integration.skipIntegrationNodes);
             }
             if (integration.filterByPathIntegrationFiles) {
-                const includePatterns = (_b = appSettings === null || appSettings === void 0 ? void 0 : appSettings.includeByFilePath) === null || _b === void 0 ? void 0 : _b.split('\n').filter(Boolean);
-                const excludePatterns = (_c = appSettings === null || appSettings === void 0 ? void 0 : appSettings.excludeByFilePath) === null || _c === void 0 ? void 0 : _c.split('\n').filter(Boolean);
+                const includePatterns = (_b = settings === null || settings === void 0 ? void 0 : settings.includeByFilePath) === null || _b === void 0 ? void 0 : _b.split('\n').filter(Boolean);
+                const excludePatterns = (_c = settings === null || settings === void 0 ? void 0 : settings.excludeByFilePath) === null || _c === void 0 ? void 0 : _c.split('\n').filter(Boolean);
                 files = (0, files_1.filterFilesByPath)(files, includePatterns, excludePatterns);
             }
             const needsFileStatus = ((_e = (_d = integration.filtering) === null || _d === void 0 ? void 0 : _d.integrationFileStatus) === null || _e === void 0 ? void 0 : _e.isNew) ||

package/out/modules/integration/handlers/integration-login.d.ts

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

package/out/modules/integration/handlers/integration-logout.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (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(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -48,7 +48,12 @@ function handle(config, integration) {
         if (integration.onLogout) {
             try {
                 req.logInfo('Invoking onLogout hook');
-                yield integration.onLogout(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials, req.integrationSettings);
+                yield integration.onLogout({
+                    projectId: req.crowdinContext.jwtPayload.context.project_id,
+                    client: req.crowdinApiClient,
+                    credentials: req.integrationCredentials,
+                    settings: req.integrationSettings,
+                });
             }
             catch (e) {
                 yield (0, logger_1.handleUserError)({
@@ -69,8 +74,8 @@ function handle(config, integration) {
                 integration,
                 client: req.crowdinApiClient,
                 crowdinContext: req.crowdinContext,
-                apiCredentials: req.integrationCredentials,
-                appSettings: req.integrationSettings,
+                credentials: req.integrationCredentials,
+                settings: req.integrationSettings,
             });
         }
         res.status(204).end();

package/out/modules/integration/handlers/integration-update.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (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(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -14,14 +14,18 @@ const util_1 = require("../../../util");
 const defaults_1 = require("../util/defaults");
 const job_1 = require("../util/job");
 const logger_1 = require("../../../util/logger");
+const types_2 = require("../types");
 const files_1 = require("../util/files");
+const logger_2 = require("../../../util/logger");
+const storage_1 = require("../../../storage");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         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 matchFromIntegration = ((_c = req.query) === null || _c === void 0 ? void 0 : _c.matchFromIntegration) === 'true';
         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}`);
@@ -34,10 +38,34 @@ function handle(config, integration) {
             });
         }
         // A request via API has a different structure
-        if (((_c = config.api) === null || _c === void 0 ? void 0 : _c.default) && req.body.files) {
+        if (((_d = config.api) === null || _d === void 0 ? void 0 : _d.default) && req.body.files) {
             req.body = req.body.files;
         }
         let payload = req.body;
+        const matchingWarnings = [];
+        // If matchFromIntegration is true, we need to match integration files to Crowdin files first
+        if (matchFromIntegration && integration.matchCrowdinFilesToIntegrationFiles) {
+            const syncedData = yield (0, storage_1.getStorage)().getSyncedData(req.crowdinContext.clientId, req.crowdinContext.crowdinId, types_2.Provider.INTEGRATION);
+            const result = yield integration.matchCrowdinFilesToIntegrationFiles({
+                projectId,
+                client,
+                credentials: req.integrationCredentials,
+                integrationFiles: req.body,
+                settings: req.integrationSettings,
+                rootFolder,
+                syncedData,
+            });
+            if ((0, files_1.isMatchingResultType)(result)) {
+                payload = result.data;
+                if (result.errors && result.errors.length > 0) {
+                    matchingWarnings.push(...result.errors);
+                    req.logInfo(`File matching completed with ${result.errors.length} warning(s). ${Array.isArray(payload) ? payload.length : Object.keys(payload).length} file(s) matched successfully and will be synced.`);
+                }
+            }
+            else {
+                payload = result;
+            }
+        }
         if (integration.excludedTargetLanguages) {
             let options = {};
             if (rootFolder) {
@@ -67,9 +95,15 @@ function handle(config, integration) {
                     credentials: req.integrationCredentials,
                     request: payload,
                     rootFolder,
-                    appSettings: req.integrationSettings,
+                    settings: req.integrationSettings,
                     job,
                 });
+                if (matchingWarnings.length > 0) {
+                    req.logInfo(`Sync completed with warnings: ${matchingWarnings.length} file(s) could not be matched.`);
+                    const error = new logger_2.AppModuleAggregateError(matchingWarnings, 'Finished with errors. See error logs.');
+                    error.isPartialSuccess = true;
+                    throw error;
+                }
                 let message;
                 if ((0, files_1.isExtendedResultType)(result)) {
                     message = result.message;
@@ -77,13 +111,17 @@ function handle(config, integration) {
                 return { message };
             }),
             onError: (e) => __awaiter(this, void 0, void 0, function* () {
+                const isPartialSuccess = (e === null || e === void 0 ? void 0 : e.isPartialSuccess) === true;
+                const errorToLog = !isPartialSuccess && matchingWarnings.length > 0
+                    ? new logger_2.AppModuleAggregateError([e, ...matchingWarnings], 'Sync failed with multiple errors')
+                    : e;
                 yield (0, logger_1.handleUserError)({
-                    action: 'Sync files to External Service',
-                    error: e,
+                    action: isPartialSuccess ? 'File matching warnings' : 'Sync files to External Service',
+                    error: errorToLog,
                     crowdinId: req.crowdinContext.crowdinId,
                     clientId: req.crowdinContext.clientId,
                 });
-                throw e;
+                throw errorToLog;
             }),
             forcePushTranslations,
         });

package/out/modules/integration/handlers/integration-webhook.d.ts

@@ -2,4 +2,4 @@
 import { Request, Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../../types").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 default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/invite-users.d.ts

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

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

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

package/out/modules/integration/handlers/job-info-deprecated.d.ts

@@ -1,4 +1,4 @@
 /// <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(config: Config): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;

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

@@ -36,8 +36,9 @@ function getHumanETA(ms) {
 }
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const isApi = req.isApiCall;
-        const id = req.query.jobId || req.body.jobId;
+        const id = ((_a = req.query) === null || _a === void 0 ? void 0 : _a.jobId) || ((_b = req.body) === null || _b === void 0 ? void 0 : _b.jobId);
         if (!id) {
             req.logInfo('Get active jobs');
             const jobs = yield (0, storage_1.getStorage)().getActiveJobs({
@@ -111,7 +112,7 @@ function handle(config) {
                     context,
                     credentials,
                     rootFolder,
-                    appSettings: intConfig,
+                    settings: intConfig,
                     reRunJobId: id,
                 });
             }

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

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

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

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

package/out/modules/integration/handlers/main.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (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(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;