@crowdin/app-project-module 0.105.0 → 0.106.0

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

@@ -63,7 +63,8 @@ function handle(config, integration) {
             message.data = oauthCredentials;
             if (((_o = integration.oauthLogin) === null || _o === void 0 ? void 0 : _o.mode) === 'polling') {
                 yield (0, storage_1.getStorage)().deleteMetadata((0, defaults_1.getOAuthPollingId)(clientId));
-                yield (0, storage_1.getStorage)().saveMetadata((0, defaults_1.getOAuthPollingId)(clientId), oauthCredentials, organization);
+                const encryptedCredentials = (0, util_1.encryptData)(config, JSON.stringify(oauthCredentials));
+                yield (0, storage_1.getStorage)().saveMetadata((0, defaults_1.getOAuthPollingId)(clientId), encryptedCredentials, organization);
             }
             return res.render('oauth', { message: JSON.stringify(message), oauthMode: (_p = integration.oauthLogin) === null || _p === void 0 ? void 0 : _p.mode });
         }

package/out/modules/integration/handlers/oauth-polling.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-import { CrowdinClientRequest } from '../../../types';
+import { Config, CrowdinClientRequest } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(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: 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/oauth-polling.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../../../storage");
 const util_1 = require("../../../util");
 const defaults_1 = require("../util/defaults");
-function handle(integration) {
+function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         req.logInfo('Received OAuth polling request');
         const { oauthLogin } = integration;
@@ -22,9 +22,11 @@ function handle(integration) {
             return;
         }
         const oauthId = (0, defaults_1.getOAuthPollingId)(req.crowdinContext.clientId);
-        const oauthCreds = yield (0, storage_1.getStorage)().getMetadata(oauthId);
-        if (oauthCreds) {
+        const encryptedCreds = yield (0, storage_1.getStorage)().getMetadata(oauthId);
+        let oauthCreds;
+        if (encryptedCreds) {
             yield (0, storage_1.getStorage)().deleteMetadata(oauthId);
+            oauthCreds = JSON.parse((0, util_1.decryptData)(config, encryptedCreds));
         }
         res.send({ oauthCreds });
     }));

package/out/modules/integration/index.js

@@ -194,7 +194,7 @@ function register({ config, app }) {
                 optional: false,
                 checkSubscriptionExpiration: false,
                 moduleKey: integrationLogic.key,
-            }), (0, oauth_polling_1.default)(integrationLogic));
+            }), (0, oauth_polling_1.default)(config, integrationLogic));
         }
     }
     if (integrationLogic.cronJobs) {

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

@@ -61,7 +61,6 @@ function applyIntegrationModuleDefaults(config, integration) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     if (!integration.getCrowdinFiles) {
         integration.getCrowdinFiles = (projectId, client, rootFolder, config, mode) => __awaiter(this, void 0, void 0, function* () {
-            const allBranches = (yield client.sourceFilesApi.withFetchAll().listProjectBranches(projectId)).data.map((d) => d.data);
             let options = {};
             if (rootFolder) {
                 options = {
@@ -69,23 +68,38 @@ function applyIntegrationModuleDefaults(config, integration) {
                     recursion: 'true',
                 };
             }
+            const needDirectories = !mode || mode === 'directories' || mode === 'files';
+            const needFiles = !mode || mode === 'files';
+            const [branchesResponse, directoriesResponse, filesResponse] = yield Promise.all([
+                client.sourceFilesApi.withFetchAll().listProjectBranches(projectId),
+                needDirectories
+                    ? client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)
+                    : { data: [] },
+                needFiles ? client.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options) : { data: [] },
+            ]);
+            const allBranches = branchesResponse.data.map((d) => d.data);
+            const allDirectories = directoriesResponse.data.map((d) => d.data);
+            const allFiles = filesResponse.data.map((d) => d.data);
+            const branchesMap = new Map(allBranches.map((b) => [b.id, b]));
+            const addedBranchIds = new Set();
             const res = [];
+            const addBranchIfNeeded = (branchId) => {
+                const branch = branchesMap.get(branchId);
+                if (branch && !addedBranchIds.has(branch.id)) {
+                    addedBranchIds.add(branch.id);
+                    res.push({
+                        id: branch.id.toString(),
+                        name: branch.name,
+                        nodeType: '2',
+                    });
+                }
+                return branch === null || branch === void 0 ? void 0 : branch.id;
+            };
             if (!mode || mode === 'directories') {
-                const allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)).data.map((d) => d.data);
                 allDirectories.forEach((e) => {
                     let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
                     if (!parentId && e.branchId) {
-                        const branch = allBranches.find((branch) => branch.id === e.branchId);
-                        if (branch) {
-                            parentId = branch.id;
-                            if (!res.find((node) => node.id === branch.id.toString())) {
-                                res.push({
-                                    id: branch.id.toString(),
-                                    name: branch.name,
-                                    nodeType: '2',
-                                });
-                            }
-                        }
+                        parentId = addBranchIfNeeded(e.branchId);
                     }
                     res.push({
                         id: e.id.toString(),
@@ -96,26 +110,15 @@ function applyIntegrationModuleDefaults(config, integration) {
             }
             if (!mode || mode === 'files') {
                 const directoryIds = mode === 'files'
-                    ? (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)).data.map((d) => d.data.id)
+                    ? allDirectories.map((d) => d.id)
                     : res.filter((item) => !item.type && item.nodeType !== '2').map((d) => parseInt(d.id));
-                let files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options)).data.map((d) => d.data);
-                files = files.filter((f) => (rootFolder && f.directoryId === rootFolder.id) ||
+                const filteredFiles = allFiles.filter((f) => (rootFolder && f.directoryId === rootFolder.id) ||
                     directoryIds.includes(f.directoryId) ||
                     (!rootFolder && !f.directoryId));
-                files.forEach((e) => {
+                filteredFiles.forEach((e) => {
                     let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
                     if (!parentId && e.branchId) {
-                        const branch = allBranches.find((branch) => branch.id === e.branchId);
-                        if (branch) {
-                            parentId = branch.id;
-                            if (!res.find((node) => node.id === branch.id.toString())) {
-                                res.push({
-                                    id: branch.id.toString(),
-                                    name: branch.name,
-                                    nodeType: '2',
-                                });
-                            }
-                        }
+                        parentId = addBranchIfNeeded(e.branchId);
                     }
                     res.push({
                         id: e.id.toString(),

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

@@ -213,17 +213,25 @@ function markUnsyncedFiles({ integrationId, crowdinId, client, files, }) {
         let unsyncedFiles = (unsyncedFilesData === null || unsyncedFilesData === void 0 ? void 0 : unsyncedFilesData.files)
             ? JSON.parse(unsyncedFilesData === null || unsyncedFilesData === void 0 ? void 0 : unsyncedFilesData.files)
             : [];
-        const fileIds = files.filter((file) => isFileLeaf(file)).map((file) => `${file.id}`);
-        const idsToRemove = unsyncedFiles.filter((file) => !fileIds.includes(file.id)).map((file) => file.id);
-        unsyncedFiles = unsyncedFiles.filter((file) => !idsToRemove.includes(file.id));
+        if (unsyncedFiles.length === 0) {
+            return files;
+        }
+        const fileIds = new Set(files.filter((file) => isFileLeaf(file)).map((file) => `${file.id}`));
+        const idsToRemove = unsyncedFiles.filter((file) => !fileIds.has(`${file.id}`)).map((file) => file.id);
+        if (idsToRemove.length > 0) {
+            unsyncedFiles = unsyncedFiles.filter((file) => !idsToRemove.includes(file.id));
+            yield (0, storage_1.getStorage)().updateUnsyncedFiles({
+                integrationId,
+                crowdinId,
+                files: JSON.stringify(unsyncedFiles),
+            });
+        }
+        if (unsyncedFiles.length === 0) {
+            return files;
+        }
         const userTimezone = (yield client.usersApi.getAuthenticatedUser()).data.timezone;
-        yield (0, storage_1.getStorage)().updateUnsyncedFiles({
-            integrationId,
-            crowdinId,
-            files: JSON.stringify(unsyncedFiles),
-        });
-        files = files.map((file) => {
-            const unsynced = unsyncedFiles.find((unsyncedFile) => unsyncedFile.id === file.id);
+        return files.map((file) => {
+            const unsynced = unsyncedFiles.find((f) => `${f.id}` === `${file.id}`);
             if (unsynced && isFileLeaf(file)) {
                 const formattedDate = (0, util_1.getFormattedDate)({ date: new Date(+unsynced.updatedAt), userTimezone });
                 file.labels = [
@@ -238,7 +246,6 @@ function markUnsyncedFiles({ integrationId, crowdinId, client, files, }) {
             }
             return file;
         });
-        return files;
     });
 }
 exports.markUnsyncedFiles = markUnsyncedFiles;

package/out/modules/status.js

@@ -47,7 +47,7 @@ function handle(config) {
             let status = 'ok';
             let message = 'Filesystem access successful';
             try {
-                const testFile = path_1.default.join(os_1.default.tmpdir(), 'status-check.txt');
+                const testFile = path_1.default.join(os_1.default.tmpdir(), `status-check-${Date.now()}.txt`);
                 yield promises_1.default.writeFile(testFile, 'test');
                 yield promises_1.default.unlink(testFile);
             }

package/out/views/login.handlebars

@@ -277,9 +277,10 @@
             .then(localStorage.removeItem('revised_{{name}}'))
             .then(reloadLocation)
             .catch(e => {
+                const errorMessage = e.message || 'Credentials are not stored';
                 loginButton.setAttribute('disabled', false);
                 loginButton.setAttribute('is-loading', false);
-                catchRejection(e, 'Credentials are not stored');
+                catchRejection(e, errorMessage);
             });
     }
 

package/package.json

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