@crowdin/app-project-module 0.21.0 → 0.22.1

package/README.md

@@ -113,6 +113,13 @@ const configuration = {
                 {
                     id: '11',
                     name: 'Folder from integratio2'
+                    customContent: `<div style='color: red;'>Custom Folder name</div>`,
+                    parentId: '1'
+                },
+                {
+                    id: '1',
+                    name: 'Branch from integratio',
+                    nodeType: '2'
                 },
             ];
         },

package/out/handlers/install.js

@@ -13,12 +13,29 @@ const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 const util_1 = require("../util");
+function fetchToken(config, event) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (config.authenticationType === models_1.AuthenticationType.APP) {
+            const token = yield (0, crowdin_apps_functions_1.fetchAppToken)(config.identifier, event.appSecret, config.clientId, config.clientSecret, event.domain || '', event.userId, (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl);
+            return {
+                accessToken: (0, util_1.encryptData)(config, token.accessToken),
+                expiresIn: token.expiresIn,
+                refreshToken: '',
+            };
+        }
+        const token = yield (0, crowdin_apps_functions_1.generateOAuthToken)(config.clientId, config.clientSecret, event.code || '', (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
+        return {
+            accessToken: (0, util_1.encryptData)(config, token.accessToken),
+            refreshToken: (0, util_1.encryptData)(config, token.refreshToken),
+            expiresIn: token.expiresIn,
+        };
+    });
+}
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const event = req.body;
-        (0, util_1.log)(`Recieved install request ${JSON.stringify(event, null, 2)}`, config.logger);
-        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 fetchToken(config, event);
         const credentials = {
             id: (event.domain || event.organizationId).toString(),
             appSecret: event.appSecret,
@@ -26,8 +43,8 @@ function handle(config) {
             userId: event.userId,
             organizationId: event.organizationId,
             baseUrl: event.baseUrl,
-            accessToken: (0, util_1.encryptData)(config, token.accessToken),
-            refreshToken: (0, util_1.encryptData)(config, token.refreshToken),
+            accessToken: token.accessToken,
+            refreshToken: token.refreshToken,
             expire: (new Date().getTime() / 1000 + token.expiresIn).toString(),
             type: event.domain ? models_1.AccountType.ENTERPRISE : models_1.AccountType.NORMAL,
         };

package/out/handlers/manifest.js

@@ -113,7 +113,7 @@ function handle(config) {
             logo: '/logo.png',
             baseUrl: config.baseUrl,
             authentication: {
-                type: 'authorization_code',
+                type: config.authenticationType || models_1.AuthenticationType.CODE,
                 clientId: config.clientId,
             },
             events,

package/out/models/index.d.ts

@@ -4,6 +4,10 @@ import { Request } from 'express';
 import { MySQLStorageConfig } from '../storage/mysql';
 import { PostgreStorageConfig } from '../storage/postgre';
 export interface Config extends ImagePath {
+    /**
+     * Authentication Crowdin App type: "authorization_code", "crowdin_app". Default: "authorization_code"
+     */
+    authenticationType?: AuthenticationType;
     /**
      * client id that we received when registering the app
      */
@@ -116,6 +120,10 @@ export interface Config extends ImagePath {
      */
     pricing?: Pricing;
 }
+export declare enum AuthenticationType {
+    CODE = "authorization_code",
+    APP = "crowdin_app"
+}
 export interface CrowdinUrls {
     apiUrl?: string;
     accountUrl?: string;
@@ -369,11 +377,15 @@ export interface File {
     name: string;
     type: SourceFilesModel.FileType;
     parentId?: string;
+    nodeType?: string;
+    customContent?: string;
 }
 export interface Folder {
     id: string;
     name: string;
     parentId?: string;
+    nodeType?: string;
+    customContent?: string;
 }
 export interface IntegrationRequest extends CrowdinClientRequest {
     integrationCredentials: any;

package/out/models/index.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EditorPanelsMode = exports.ProcessFileJobType = exports.SubscriptionInfoType = exports.AccountType = exports.Scope = void 0;
+exports.EditorPanelsMode = exports.ProcessFileJobType = exports.SubscriptionInfoType = exports.AccountType = exports.Scope = exports.AuthenticationType = void 0;
+var AuthenticationType;
+(function (AuthenticationType) {
+    AuthenticationType["CODE"] = "authorization_code";
+    AuthenticationType["APP"] = "crowdin_app";
+})(AuthenticationType = exports.AuthenticationType || (exports.AuthenticationType = {}));
 var Scope;
 (function (Scope) {
     Scope["ALL_SCOPES"] = "all";

package/out/storage/mysql.js

@@ -233,7 +233,7 @@ class MySQLStorage {
     updateMetadata(id, metadata) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('UPDATE app_metadata SET data = ? WHERE id = ?', [id, JSON.stringify(metadata)]));
+            yield this.executeQuery(connection => connection.execute('UPDATE app_metadata SET data = ? WHERE id = ?', [JSON.stringify(metadata), id]));
         });
     }
     getMetadata(id) {

package/out/storage/postgre.js

@@ -229,7 +229,7 @@ class PostgreStorage {
     updateMetadata(id, metadata) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('UPDATE app_metadata SET data = $1 WHERE id = $2', [id, JSON.stringify(metadata)]));
+            yield this.executeQuery(client => client.query('UPDATE app_metadata SET data = $1 WHERE id = $2', [JSON.stringify(metadata), id]));
         });
     }
     getMetadata(id) {

package/out/util/connection.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -33,13 +14,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSubscription = exports.isAppFree = exports.clearCache = exports.prepareIntegrationCredentials = exports.prepareCrowdinClient = void 0;
 const crowdin_api_client_1 = __importDefault(require("@crowdin/crowdin-api-client"));
-const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
+const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
 const axios_1 = __importDefault(require("axios"));
 const _1 = require(".");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
+function refreshToken(config, credentials) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (config.authenticationType === models_1.AuthenticationType.APP) {
+            const token = yield (0, crowdin_apps_functions_1.fetchAppToken)(config.identifier, credentials.appSecret, config.clientId, config.clientSecret, credentials.domain || '', credentials.userId, (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.accountUrl);
+            return {
+                accessToken: (0, _1.encryptData)(config, token.accessToken),
+                expiresIn: token.expiresIn,
+                refreshToken: '',
+            };
+        }
+        const token = yield (0, crowdin_apps_functions_1.refreshOAuthToken)(config.clientId, config.clientSecret, (0, _1.decryptData)(config, credentials.refreshToken), (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
+        return {
+            accessToken: (0, _1.encryptData)(config, token.accessToken),
+            refreshToken: (0, _1.encryptData)(config, token.refreshToken),
+            expiresIn: token.expiresIn,
+        };
+    });
+}
 function prepareCrowdinClient(config, credentials) {
-    var _a, _b, _c;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const isExpired = +credentials.expire < +new Date().getTime() / 1000;
         const organization = credentials.type === models_1.AccountType.ENTERPRISE ? credentials.id : undefined;
@@ -51,7 +51,7 @@ function prepareCrowdinClient(config, credentials) {
             };
         }
         (0, _1.log)('Crowdin credentials have expired. Requesting a new credentials', config.logger);
-        const newCredentials = yield crowdinAppFunctions.refreshOAuthToken(config.clientId, config.clientSecret, (0, _1.decryptData)(config, credentials.refreshToken), (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
+        const newCredentials = yield refreshToken(config, credentials);
         (0, _1.log)('Saving updated crowdin credentials in the database', config.logger);
         yield (0, storage_1.getStorage)().updateCrowdinCredentials({
             id: credentials.id,
@@ -60,18 +60,15 @@ function prepareCrowdinClient(config, credentials) {
             userId: credentials.userId,
             organizationId: credentials.organizationId,
             baseUrl: credentials.baseUrl,
-            refreshToken: (0, _1.encryptData)(config, newCredentials.refreshToken),
-            accessToken: (0, _1.encryptData)(config, newCredentials.accessToken),
+            refreshToken: newCredentials.refreshToken,
+            accessToken: newCredentials.accessToken,
             expire: (new Date().getTime() / 1000 + newCredentials.expiresIn).toString(),
             type: credentials.type,
         });
+        const token = (0, _1.decryptData)(config, credentials.accessToken);
         return {
-            client: new crowdin_api_client_1.default({
-                token: newCredentials.accessToken,
-                organization,
-                baseUrl: (_c = config.crowdinUrls) === null || _c === void 0 ? void 0 : _c.apiUrl,
-            }),
-            token: newCredentials.accessToken,
+            client: new crowdin_api_client_1.default({ token, organization, baseUrl: (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.apiUrl }),
+            token: token,
         };
     });
 }
@@ -170,7 +167,7 @@ function checkSubscription(config, token, organization, accountType) {
             }
         }
         try {
-            const subscription = yield crowdinAppFunctions.getSubscription({
+            const subscription = yield (0, crowdin_apps_functions_1.getSubscription)({
                 appIdentifier,
                 organization: accountType === models_1.AccountType.ENTERPRISE ? organization : undefined,
                 token,
@@ -183,7 +180,7 @@ function checkSubscription(config, token, organization, accountType) {
             return { expired, daysLeft, type: models_1.SubscriptionInfoType.SUBSCRIPTION };
         }
         catch (e) {
-            if (e instanceof crowdinAppFunctions.PaymentRequiredError) {
+            if (e instanceof crowdin_apps_functions_1.PaymentRequiredError) {
                 const { initializedAt, subscribeLink } = e;
                 (0, _1.log)(`Recieved 402 payment error. initializedAt ${initializedAt}`, config.logger);
                 //default 2 weeks

package/out/util/defaults.js

@@ -140,6 +140,9 @@ function applyDefaults(config, integration) {
                         },
                     ],
                 },
+                {
+                    label: "To avoid downloading partially translated files, we recommend enabling the 'Skip untranslated files' option in your Crowdin project.",
+                },
                 ...fields,
             ];
         });

package/out/views/main.handlebars

@@ -186,12 +186,13 @@
                         parent_id: e.parentId ? e.parentId : '0',
                         name: e.name,
                         id: e.id,
+                        customContent: e.customContent,
                     };
                     if (e.type) {
                         item.type = e.type;
                         item.node_type = fileType;
                     } else {
-                        item.node_type = folderType;
+                        item.node_type = e.nodeType || folderType;
                     }
                     return item;
                 });
@@ -223,12 +224,13 @@
                         parent_id: e.parentId ? e.parentId : '0',
                         name: e.name,
                         id: e.id,
+                        customContent: e.customContent,
                     };
                     if (e.type) {
                         item.type = e.type;
                         item.node_type = fileType;
                     } else {
-                        item.node_type = folderType;
+                        item.node_type = e.nodeType || folderType;
                     }
                     return item;
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.21.0",
+  "version": "0.22.1",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -12,7 +12,7 @@
     "test": "echo \"test not implemented\""
   },
   "dependencies": {
-    "@crowdin/crowdin-apps-functions": "0.1.6",
+    "@crowdin/crowdin-apps-functions": "~0.2.1",
     "@types/pg": "^8.6.5",
     "crypto-js": "^4.0.0",
     "express": "4.17.1",