@crowdin/app-project-module 0.20.5 → 0.20.7

package/README.md

@@ -43,6 +43,7 @@ In both options you will need to provide Crowdin App configuration file. Please
   - [Custom MT](#custom-mt)
   - [Profile Resources Menu](#profile-resources-menu)
   - [Other modules](#other-modules)
+- [Other options](#other-options)
 - [Contributing](#contributing)
 - [Seeking Assistance](#seeking-assistance)
 - [License](#license)
@@ -768,6 +769,16 @@ const configuration = {
 crowdinModule.createApp(configuration);
 ```
 
+## Other options
+
+### Options for Crowdin JWT token validation
+
+```js
+configuration.jwtValidationOptions = {
+    jwtValidationOptions: false, //ignore check if jwt is expired or not
+};
+```
+
 ## Contributing
 
 If you want to contribute please read the [Contributing](/CONTRIBUTING.md) guidelines.

package/out/middlewares/crowdin-client.js

@@ -28,7 +28,7 @@ function getToken(req) {
 function prepareCrowdinRequest(jwtToken, config, optional = false, checkSubscriptionExpiration = true) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, util_1.log)('Validating jwt token from incoming request', config.logger);
-        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret);
+        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret, config.jwtValidationOptions);
         const context = {
             jwtPayload,
             clientId: (0, crowdin_apps_functions_1.constructCrowdinIdFromJwtPayload)(jwtPayload),

package/out/middlewares/ui-module.js

@@ -20,7 +20,7 @@ function handle(config) {
             return res.status(403).send({ error: 'Access denied' });
         }
         (0, util_1.log)('Validating jwt token from incoming request', config.logger);
-        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(tokenJwt, config.clientSecret);
+        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(tokenJwt, config.clientSecret, config.jwtValidationOptions);
         const id = `${jwtPayload.domain || jwtPayload.context.organization_id}`;
         (0, util_1.log)('Loading crowdin credentials', config.logger);
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(id);

package/out/models/index.d.ts

@@ -1,5 +1,5 @@
 import Crowdin, { LanguagesModel, SourceFilesModel, SourceStringsModel } from '@crowdin/crowdin-api-client';
-import { JwtPayload } from '@crowdin/crowdin-apps-functions';
+import { JwtPayload, VerifyOptions } from '@crowdin/crowdin-apps-functions';
 import { Request } from 'express';
 import { MySQLStorageConfig } from '../storage/mysql';
 import { PostgreStorageConfig } from '../storage/postgre';
@@ -16,6 +16,10 @@ export interface Config extends ImagePath {
      * Secret to encrypt/decrypt credentials (by default @clientSecret will be used)
      */
     cryptoSecret?: string;
+    /**
+     * Options to validate Crowdin JWT token
+     */
+    jwtValidationOptions?: VerifyOptions;
     /**
      * https url where an app is reachable from the internet (e.g. the one that ngrok generates for us)
      */

package/out/storage/mysql.js

@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLStorage = void 0;
+const util_1 = require("../util");
 class MySQLStorage {
     constructor(config) {
         this.mysql = require('mysql2/promise');
@@ -24,19 +25,26 @@ class MySQLStorage {
     }
     executeQuery(command) {
         return __awaiter(this, void 0, void 0, function* () {
-            let connection;
-            try {
-                connection = yield this.mysql.createConnection(this.config);
-                const res = yield command(connection);
-                yield connection.end();
-                return res;
-            }
-            catch (e) {
-                if (connection) {
+            return (0, util_1.executeWithRetry)(() => __awaiter(this, void 0, void 0, function* () {
+                let connection;
+                try {
+                    connection = yield this.mysql.createConnection(this.config);
+                    const res = yield command(connection);
                     yield connection.end();
+                    return res;
                 }
-                throw e;
-            }
+                catch (error) {
+                    if (connection) {
+                        try {
+                            yield connection.end();
+                        }
+                        catch (nestedError) {
+                            throw nestedError;
+                        }
+                    }
+                    throw error;
+                }
+            }));
         });
     }
     migrate() {

package/out/storage/postgre.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgreStorage = void 0;
 const pg_1 = require("pg");
+const util_1 = require("../util");
 class PostgreStorage {
     constructor(config) {
         this.dbPromise = new Promise((res, rej) => {
@@ -22,19 +23,24 @@ class PostgreStorage {
     }
     executeQuery(command) {
         return __awaiter(this, void 0, void 0, function* () {
-            const client = new pg_1.Client(this.config);
-            try {
-                yield client.connect();
-                const res = yield command(client);
-                yield client.end();
-                return res;
-            }
-            catch (e) {
-                console.error('executeQuery error occurred!');
-                console.error(e);
-                yield client.end();
-                throw e;
-            }
+            return (0, util_1.executeWithRetry)(() => __awaiter(this, void 0, void 0, function* () {
+                const client = new pg_1.Client(this.config);
+                try {
+                    yield client.connect();
+                    const res = yield command(client);
+                    yield client.end();
+                    return res;
+                }
+                catch (error) {
+                    try {
+                        yield client.end();
+                        throw error;
+                    }
+                    catch (nestedError) {
+                        throw nestedError;
+                    }
+                }
+            }));
         });
     }
     migrate() {

package/out/util/index.d.ts

@@ -9,3 +9,4 @@ export declare function getMessage(err: any): any;
 export declare function runAsyncWrapper(callback: Function, onError?: (e: any) => void): (req: Request, res: Response, next: Function) => void;
 export declare function encryptData(config: Config, data: string): string;
 export declare function decryptData(config: Config, data: string): string;
+export declare function executeWithRetry<T>(func: () => Promise<T>, numOfRetries?: number): Promise<T>;

package/out/util/index.js

@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.getMessage = exports.log = exports.CodeError = void 0;
+exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.getMessage = exports.log = exports.CodeError = void 0;
 const crypto = __importStar(require("crypto-js"));
 const storage_1 = require("../storage");
 class CodeError extends Error {
@@ -103,3 +103,20 @@ function decryptData(config, data) {
     return crypto.AES.decrypt(data, config.cryptoSecret || config.clientSecret).toString(crypto.enc.Utf8);
 }
 exports.decryptData = decryptData;
+function executeWithRetry(func, numOfRetries = 2) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (let i = 0; i <= numOfRetries; i++) {
+            try {
+                const result = yield func();
+                return result;
+            }
+            catch (error) {
+                if (i === numOfRetries) {
+                    throw error;
+                }
+            }
+        }
+        throw new Error('Failed to process request with retry');
+    });
+}
+exports.executeWithRetry = executeWithRetry;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.20.5",
+  "version": "0.20.7",
   "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.4",
+    "@crowdin/crowdin-apps-functions": "0.1.6",
     "@types/pg": "^8.6.5",
     "crypto-js": "^4.0.0",
     "express": "4.17.1",