@crowdin/app-project-module 0.24.2 → 0.25.0

package/README.md

@@ -133,26 +133,26 @@ const configuration = {
             const directories = await client.sourceFilesApi
                 .withFetchAll()
                 .listProjectDirectories(projectId);
-            const { folder, files } = await crowdinAppFunctions.getOrCreateFolder(
-                directories.data.map((d) => d.data),
+            const { folder, files } = await crowdinAppFunctions.getOrCreateFolder({
+                directories: directories.data.map((d) => d.data),
                 client,
                 projectId,
-                'Folder from integration',
-                rootFolder
-            );
+                directoryName: 'Folder from integration',
+                parentDirectory: rootFolder
+            });
             const fileContent = {
                 title: 'Hello World',
             };
-            await crowdinAppFunctions.updateOrCreateFile(
+            await crowdinAppFunctions.updateOrCreateFile({
                 client,
                 projectId,
-                'integration.json',
-                'Sample file from integration',
-                'json',
-                folder.id,
-                fileContent,
-                files.find((f) => f.name === 'integration.json'),
-            );
+                name: 'integration.json',
+                title: 'Sample file from integration',
+                type: 'json',
+                directoryId: folder.id,
+                data: fileContent,
+                file: files.find((f) => f.name === 'integration.json'),
+            });
             return {
                 message: 'Some message',
             };
@@ -163,13 +163,13 @@ const configuration = {
             const directories = await client.sourceFilesApi
                 .withFetchAll()
                 .listProjectDirectories(projectId);
-            const { files } = await crowdinAppFunctions.getFolder(
-                directories.data.map((d) => d.data),
+            const { files } = await crowdinAppFunctions.getFolder({
+                directories: directories.data.map((d) => d.data),
                 client,
                 projectId,
-                'Folder from integration',
-                rootFolder
-            );
+                directoryName: 'Folder from integration',
+                parentDirectory: rootFolder
+            });
             const file = files.find((f) => f.name === 'integration.json');
             if (file) {
                 const translationsLink =

package/out/handlers/install.js

@@ -46,14 +46,27 @@ function fetchToken(config, event) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (config.authenticationType === models_1.AuthenticationType.CODE) {
-            const token = yield (0, crowdin_apps_functions_1.generateOAuthToken)(config.clientId, config.clientSecret, event.code || '', (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl);
+            const token = yield (0, crowdin_apps_functions_1.generateOAuthToken)({
+                clientId: config.clientId,
+                clientSecret: config.clientSecret,
+                code: event.code || '',
+                url: (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl,
+            });
             return {
                 accessToken: (0, util_1.encryptData)(config, token.accessToken),
                 refreshToken: (0, util_1.encryptData)(config, token.refreshToken),
                 expiresIn: token.expiresIn,
             };
         }
-        const token = yield (0, crowdin_apps_functions_1.fetchAppToken)(config.identifier, event.appSecret, config.clientId, config.clientSecret, event.domain || '', event.userId, (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
+        const token = yield (0, crowdin_apps_functions_1.fetchAppToken)({
+            appId: config.identifier,
+            appSecret: event.appSecret,
+            clientId: config.clientId,
+            clientSecret: config.clientSecret,
+            domain: event.domain || '',
+            userId: event.userId,
+            url: (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl,
+        });
         return {
             accessToken: (0, util_1.encryptData)(config, token.accessToken),
             expiresIn: token.expiresIn,

package/out/models/index.d.ts

@@ -370,19 +370,25 @@ export interface MessageResult<T> {
     message?: string;
 }
 export declare type TreeItem = File | Folder;
+/**
+ * 0 - folder
+ * 1 - file
+ * 2 - branch
+ */
+declare type IntegrationTreeElementType = '0' | '1' | '2';
 export interface File {
     id: string;
     name: string;
     type: SourceFilesModel.FileType;
     parentId?: string;
-    nodeType?: string;
+    nodeType?: IntegrationTreeElementType;
     customContent?: string;
 }
 export interface Folder {
     id: string;
     name: string;
     parentId?: string;
-    nodeType?: string;
+    nodeType?: IntegrationTreeElementType;
     customContent?: string;
 }
 export interface IntegrationRequest extends CrowdinClientRequest {

package/out/util/connection.js

@@ -23,14 +23,27 @@ function refreshToken(config, credentials) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (config.authenticationType === models_1.AuthenticationType.CODE) {
-            const token = yield (0, crowdin_apps_functions_1.refreshOAuthToken)(config.clientId, config.clientSecret, (0, _1.decryptData)(config, credentials.refreshToken), (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl);
+            const token = yield (0, crowdin_apps_functions_1.refreshOAuthToken)({
+                clientId: config.clientId,
+                clientSecret: config.clientSecret,
+                refreshToken: (0, _1.decryptData)(config, credentials.refreshToken),
+                url: (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl,
+            });
             return {
                 accessToken: (0, _1.encryptData)(config, token.accessToken),
                 refreshToken: (0, _1.encryptData)(config, token.refreshToken),
                 expiresIn: token.expiresIn,
             };
         }
-        const token = yield (0, crowdin_apps_functions_1.fetchAppToken)(config.identifier, credentials.appSecret, config.clientId, config.clientSecret, credentials.domain || '', credentials.userId, (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
+        const token = yield (0, crowdin_apps_functions_1.fetchAppToken)({
+            appId: config.identifier,
+            appSecret: credentials.appSecret,
+            clientId: config.clientId,
+            clientSecret: config.clientSecret,
+            domain: credentials.domain || '',
+            userId: credentials.userId,
+            url: (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl,
+        });
         return {
             accessToken: (0, _1.encryptData)(config, token.accessToken),
             expiresIn: token.expiresIn,

package/out/util/defaults.js

@@ -37,7 +37,12 @@ function getRootFolder(config, integration, client, projectId) {
         }
         const folder = integration.appFolderName || config.name;
         const directories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId)).data.map((d) => d.data);
-        const { folder: rootFolder } = yield crowdinAppFunctions.getOrCreateFolder(directories, client, projectId, folder);
+        const { folder: rootFolder } = yield crowdinAppFunctions.getOrCreateFolder({
+            directories,
+            client,
+            projectId,
+            directoryName: folder,
+        });
         return rootFolder;
     });
 }
@@ -50,6 +55,7 @@ exports.getOauthRoute = getOauthRoute;
 function applyDefaults(config, integration) {
     if (!integration.getCrowdinFiles) {
         integration.getCrowdinFiles = (projectId, client, rootFolder) => __awaiter(this, void 0, void 0, function* () {
+            const allBranches = (yield client.sourceFilesApi.withFetchAll().listProjectBranches(projectId)).data.map((d) => d.data);
             let allDirectories;
             if (rootFolder) {
                 allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, {
@@ -67,7 +73,20 @@ function applyDefaults(config, integration) {
                 (!rootFolder && !f.directoryId));
             const res = [];
             allDirectories.forEach((e) => {
-                const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                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',
+                            });
+                        }
+                    }
+                }
                 res.push({
                     id: e.id.toString(),
                     parentId: parentId ? parentId.toString() : undefined,
@@ -75,7 +94,20 @@ function applyDefaults(config, integration) {
                 });
             });
             files.forEach((e) => {
-                const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                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',
+                            });
+                        }
+                    }
+                }
                 res.push({
                     id: e.id.toString(),
                     parentId: parentId ? parentId.toString() : undefined,

package/out/views/main.handlebars

@@ -175,6 +175,7 @@
 
     const folderType = '0';
     const fileType = '1';
+    const branchType = '2';
 
     let project = {};
     let crowdinData = [];
@@ -409,10 +410,14 @@
                 {{/if}}
             });
     }
+    {{else}}
+         const settingsModal = undefined;
     {{/if}}
 
     {{#if infoModal}}
          const infoModal = document.getElementById('info-modal');
+    {{else}}
+         const infoModal = undefined;
     {{/if}}
 
     document.addEventListener('keydown', (event) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.24.2",
+  "version": "0.25.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -13,7 +13,7 @@
     "test": "jest --config jestconfig.json"
   },
   "dependencies": {
-    "@crowdin/crowdin-apps-functions": "~0.2.1",
+    "@crowdin/crowdin-apps-functions": "0.3.0",
     "@types/pg": "^8.6.5",
     "crypto-js": "^4.0.0",
     "express": "4.17.1",