@crowdin/app-project-module 0.23.5 → 0.24.0

package/README.md

@@ -833,6 +833,12 @@ configuration.jwtValidationOptions = {
 };
 ```
 
+### App authentication type
+
+```js
+configuration.authenticationType = 'authorization_code'; //default is "crowdin_app"
+```
+
 ## Contributing
 
 If you want to contribute please read the [Contributing](/CONTRIBUTING.md) guidelines.

package/out/handlers/crowdin-file-progress.js

@@ -16,7 +16,7 @@ function handle(config) {
         (0, util_1.log)(`Loading translation progress for file ${fileId}`, config.logger);
         const progress = yield req.crowdinApiClient.translationStatusApi.getFileProgress(req.crowdinContext.jwtPayload.context.project_id, fileId);
         (0, util_1.log)(`Translation progress for file ${fileId} ${JSON.stringify(progress.data, null, 2)}`, config.logger);
-        res.send({ [fileId]: progress.data.map(e => e.data) });
+        res.send({ [fileId]: progress.data.map((e) => e.data) });
     }), config.onError);
 }
 exports.default = handle;

package/out/handlers/custom-file-format/process.js

@@ -135,15 +135,15 @@ function handleParseFile(baseUrl, dataFolder, config, req, client, context, proj
         if (res.strings) {
             let strings = res.strings;
             if (config.autoUploadTranslations) {
-                strings = strings.map(string => {
+                strings = strings.map((string) => {
                     const translations = {};
                     req.targetLanguages
-                        .map(targetLanguage => targetLanguage.id)
-                        .forEach(targetLanguage => (translations[targetLanguage] = { text: string.text }));
+                        .map((targetLanguage) => targetLanguage.id)
+                        .forEach((targetLanguage) => (translations[targetLanguage] = { text: string.text }));
                     return Object.assign(Object.assign({}, string), { translations });
                 });
             }
-            const stringsNDJson = strings.map(s => JSON.stringify(s)).join('\n\r');
+            const stringsNDJson = strings.map((s) => JSON.stringify(s)).join('\n\r');
             if (Buffer.byteLength(stringsNDJson, 'utf8') < maxSize) {
                 response.strings = strings;
             }
@@ -164,7 +164,7 @@ function handleParseFile(baseUrl, dataFolder, config, req, client, context, proj
 }
 function storeFile(fileContent, folder) {
     const fileName = `file${Date.now()}`;
-    return new Promise((res, rej) => fs_1.default.writeFile(path_1.default.join(folder, 'custom-file-format', fileName), fileContent, err => {
+    return new Promise((res, rej) => fs_1.default.writeFile(path_1.default.join(folder, 'custom-file-format', fileName), fileContent, (err) => {
         if (err) {
             rej(err);
         }

package/out/handlers/custom-mt/translate.js

@@ -15,7 +15,7 @@ function handle(baseConfig, config) {
         const source = req.query.source;
         const target = req.query.target;
         const body = req.body;
-        (0, util_1.log)('Recieved request for custom mt', baseConfig.logger);
+        (0, util_1.log)('Received request for custom mt', baseConfig.logger);
         (0, util_1.log)(`Source language ${source}, target language ${target}`, baseConfig.logger);
         (0, util_1.log)(`Payload ${JSON.stringify(body, null, 2)}`, baseConfig.logger);
         const projectId = Number(req.query.project_id);

package/out/handlers/install.js

@@ -13,25 +13,6 @@ 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* () {
         const event = req.body;
@@ -45,7 +26,7 @@ function handle(config) {
             baseUrl: event.baseUrl,
             accessToken: token.accessToken,
             refreshToken: token.refreshToken,
-            expire: (new Date().getTime() / 1000 + token.expiresIn).toString(),
+            expire: (Date.now() / 1000 + token.expiresIn).toString(),
             type: event.domain ? models_1.AccountType.ENTERPRISE : models_1.AccountType.NORMAL,
         };
         const existingCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(credentials.id);
@@ -61,3 +42,22 @@ function handle(config) {
     }), config.onError);
 }
 exports.default = handle;
+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);
+            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);
+        return {
+            accessToken: (0, util_1.encryptData)(config, token.accessToken),
+            expiresIn: token.expiresIn,
+            refreshToken: '',
+        };
+    });
+}

package/out/handlers/integration-login.js

@@ -13,7 +13,7 @@ const storage_1 = require("../storage");
 const util_1 = require("../util");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Recieved integration login request', config.logger);
+        (0, util_1.log)('Received integration login request', config.logger);
         if (integration.checkConnection) {
             (0, util_1.log)('Checking the integration credentials', config.logger);
             yield integration.checkConnection(req.body.credentials);

package/out/handlers/integration-logout.js

@@ -14,7 +14,7 @@ const util_1 = require("../util");
 const connection_1 = require("../util/connection");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Recieved integration logout request', config.logger);
+        (0, util_1.log)('Received integration logout request', config.logger);
         if (integration.onLogout) {
             (0, util_1.log)('Invoking onLogout hook', config.logger);
             yield integration.onLogout(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials, req.integrationSettings);

package/out/handlers/integration-update.js

@@ -13,10 +13,10 @@ const util_1 = require("../util");
 const defaults_1 = require("../util/defaults");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Upading integratino data', config.logger);
+        (0, util_1.log)('Updating integration data', config.logger);
         const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, req.crowdinContext.jwtPayload.context.project_id);
         if (rootFolder) {
-            (0, util_1.log)(`Upading integration data for crowding root folder ${rootFolder.id}`, config.logger);
+            (0, util_1.log)(`Updating integration data for crowding root folder ${rootFolder.id}`, config.logger);
         }
         const result = yield integration.updateIntegration(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials, req.body, rootFolder, req.integrationSettings);
         let message;

package/out/handlers/manifest.js

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

package/out/handlers/oauth-login.js

@@ -22,7 +22,7 @@ function handle(config, integration) {
             uid: 'oauth_popup',
         };
         const code = req.query[((_b = (_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.fieldsMapping) === null || _b === void 0 ? void 0 : _b.code) || 'code'];
-        (0, util_1.log)(`Recieved request from OAuth login callback. Code ${code}`, config.logger);
+        (0, util_1.log)(`Received request from OAuth login callback. Code ${code}`, config.logger);
         try {
             const oauthLogin = integration.oauthLogin;
             let credentials;

package/out/handlers/oauth-url.js

@@ -13,7 +13,7 @@ const util_1 = require("../util");
 const defaults_1 = require("../util/defaults");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        (0, util_1.log)('Recieved OAuth login url request', config.logger);
+        (0, util_1.log)('Received OAuth login url request', config.logger);
         const { oauthLogin } = integration;
         if (!oauthLogin) {
             (0, util_1.log)('OAuth login url request is not supported', config.logger);

package/out/handlers/subscription-paid.js

@@ -14,7 +14,7 @@ const connection_1 = require("../util/connection");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const organizationId = (req.query || {})['organization_id'] || (req.body || {})['organization_id'];
-        (0, util_1.log)(`Recieved subscription paid request for organization ${organizationId}`, config.logger);
+        (0, util_1.log)(`Received subscription paid request for organization ${organizationId}`, config.logger);
         (0, connection_1.clearCache)(organizationId);
         res.status(204).end();
     }), config.onError);

package/out/handlers/uninstall.js

@@ -15,7 +15,7 @@ const connection_1 = require("../util/connection");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const event = req.body;
-        (0, util_1.log)(`Recieved uninstall request ${JSON.stringify(event, null, 2)}`, config.logger);
+        (0, util_1.log)(`Received uninstall request ${JSON.stringify(event, null, 2)}`, config.logger);
         const projectIntegration = config.projectIntegration;
         const organization = (event.domain || event.organizationId).toString();
         if (config.onUninstall) {

package/out/index.js

@@ -121,7 +121,7 @@ function addCrowdinEndpoints(app, config) {
             app.post('/api/oauth-url', json_response_1.default, (0, crowdin_client_1.default)(config, false, false), (0, oauth_url_1.default)(config, integrationLogic));
         }
         if (integrationLogic.cronJobs) {
-            integrationLogic.cronJobs.forEach(job => {
+            integrationLogic.cronJobs.forEach((job) => {
                 cron.schedule(job.expression, () => (0, cron_1.runJob)(config, integrationLogic, job).catch(console.error));
             });
         }
@@ -184,7 +184,7 @@ function addCrowdinEndpoints(app, config) {
                 return JSON.parse(integrationCredentials.config);
             }
         }),
-        establishCrowdinConnection: jwtToken => (0, crowdin_client_1.prepareCrowdinRequest)(jwtToken, config),
+        establishCrowdinConnection: (jwtToken) => (0, crowdin_client_1.prepareCrowdinRequest)(jwtToken, config),
     };
 }
 exports.addCrowdinEndpoints = addCrowdinEndpoints;

package/out/models/index.d.ts

@@ -5,7 +5,7 @@ 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"
+     * Authentication Crowdin App type: "authorization_code", "crowdin_app". Default: "crowdin_app"
      */
     authenticationType?: AuthenticationType;
     /**
@@ -589,7 +589,7 @@ export interface IntegrationSyncSettings {
     files?: any;
     integrationId: string;
     crowdinId: string;
-    provider: string;
+    provider: 'integration' | 'crowdin';
 }
 interface ImagePath {
     /**

package/out/storage/mysql.js

@@ -108,7 +108,7 @@ class MySQLStorage {
     saveCrowdinCredentials(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('INSERT INTO crowdin_credentials(id, app_secret, domain, user_id, organization_id, base_url, access_token, refresh_token, expire, type) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO crowdin_credentials(id, app_secret, domain, user_id, organization_id, base_url, access_token, refresh_token, expire, type) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
                 credentials.id,
                 credentials.appSecret,
                 credentials.domain,
@@ -125,7 +125,7 @@ class MySQLStorage {
     updateCrowdinCredentials(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('UPDATE crowdin_credentials SET app_secret = ?, domain = ?, user_id = ?, organization_id = ?, base_url = ?, access_token = ?, refresh_token = ?, expire = ? WHERE id = ?', [
+            yield this.executeQuery((connection) => connection.execute('UPDATE crowdin_credentials SET app_secret = ?, domain = ?, user_id = ?, organization_id = ?, base_url = ?, access_token = ?, refresh_token = ?, expire = ? WHERE id = ?', [
                 credentials.appSecret,
                 credentials.domain,
                 credentials.userId,
@@ -142,7 +142,7 @@ class MySQLStorage {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, app_secret as "appSecret", domain, user_id as "userId", organization_id as "organizationId", base_url as "baseUrl", access_token as "accessToken", refresh_token as "refreshToken", expire, type FROM crowdin_credentials WHERE id = ?', [id]);
+                const [rows] = yield connection.execute('SELECT id, app_secret as "appSecret", domain, user_id as "userId", organization_id as "organizationId", base_url as "baseUrl", access_token as "accessToken", refresh_token as "refreshToken", expire, type FROM crowdin_credentials WHERE id = ?', [id]);
                 return (rows || [])[0];
             }));
         });
@@ -169,7 +169,7 @@ class MySQLStorage {
     saveIntegrationCredentials(id, credentials, crowdinId) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('INSERT INTO integration_credentials(id, credentials, crowdin_id) VALUES (?, ?, ?)', [
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO integration_credentials(id, credentials, crowdin_id) VALUES (?, ?, ?)', [
                 id,
                 credentials,
                 crowdinId,
@@ -179,20 +179,20 @@ class MySQLStorage {
     updateIntegrationCredentials(id, credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('UPDATE integration_credentials SET credentials = ? WHERE id = ?', [credentials, id]));
+            yield this.executeQuery((connection) => connection.execute('UPDATE integration_credentials SET credentials = ? WHERE id = ?', [credentials, id]));
         });
     }
     updateIntegrationConfig(id, config) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('UPDATE integration_credentials SET config = ? WHERE id = ?', [config, id]));
+            yield this.executeQuery((connection) => connection.execute('UPDATE integration_credentials SET config = ? WHERE id = ?', [config, id]));
         });
     }
     getIntegrationCredentials(id) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, credentials, config, crowdin_id as "crowdinId" FROM integration_credentials WHERE id = ?', [id]);
+                const [rows] = yield connection.execute('SELECT id, credentials, config, crowdin_id as "crowdinId" FROM integration_credentials WHERE id = ?', [id]);
                 return (rows || [])[0];
             }));
         });
@@ -201,7 +201,7 @@ class MySQLStorage {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, credentials, config, crowdin_id as "crowdinId" FROM integration_credentials WHERE crowdin_id = ?', [crowdinId]);
+                const [rows] = yield connection.execute('SELECT id, credentials, config, crowdin_id as "crowdinId" FROM integration_credentials WHERE crowdin_id = ?', [crowdinId]);
                 return rows || [];
             }));
         });
@@ -227,13 +227,13 @@ class MySQLStorage {
     saveMetadata(id, metadata) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('INSERT INTO app_metadata(id, data) VALUES (?, ?)', [id, JSON.stringify(metadata)]));
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO app_metadata(id, data) VALUES (?, ?)', [id, JSON.stringify(metadata)]));
         });
     }
     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 = ?', [JSON.stringify(metadata), id]));
+            yield this.executeQuery((connection) => connection.execute('UPDATE app_metadata SET data = ? WHERE id = ?', [JSON.stringify(metadata), id]));
         });
     }
     getMetadata(id) {
@@ -250,14 +250,14 @@ class MySQLStorage {
     deleteMetadata(id) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('DELETE FROM app_metadata where id = ?', [id]));
+            yield this.executeQuery((connection) => connection.execute('DELETE FROM app_metadata where id = ?', [id]));
         });
     }
     getSyncSettingsByProvider(integrationId, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE integration_id = ? AND provider = ?', [integrationId, provider]);
+                const [rows] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE integration_id = ? AND provider = ?', [integrationId, provider]);
                 return (rows || [])[0];
             }));
         });
@@ -266,7 +266,7 @@ class MySQLStorage {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE type = ?', [type]);
+                const [rows] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE type = ?', [type]);
                 return rows || [];
             }));
         });
@@ -274,20 +274,20 @@ class MySQLStorage {
     saveSyncSettings(files, integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES (?, , ?, ?, ?)', [files, integrationId, crowdinId, type, provider]));
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES (?, , ?, ?, ?)', [files, integrationId, crowdinId, type, provider]));
         });
     }
     updateSyncSettings(files, integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(connection => connection.execute('UPDATE sync_settings SET files = ? WHERE integration_id = ? AND crowdin_id = ? AND type = ? AND provider = ?', [files, integrationId, crowdinId, type, provider]));
+            yield this.executeQuery((connection) => connection.execute('UPDATE sync_settings SET files = ? WHERE integration_id = ? AND crowdin_id = ? AND type = ? AND provider = ?', [files, integrationId, crowdinId, type, provider]));
         });
     }
     getSyncSettings(integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
-                const [rows,] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type FROM sync_settings WHERE integration_id = ? AND crowdin_id = ? AND type = ? AND provider = ?', [integrationId, crowdinId, type, provider]);
+                const [rows] = yield connection.execute('SELECT id, files, integration_id as "integrationId", crowdin_id as "crowdinId", type FROM sync_settings WHERE integration_id = ? AND crowdin_id = ? AND type = ? AND provider = ?', [integrationId, crowdinId, type, provider]);
                 return (rows || [])[0];
             }));
         });

package/out/storage/postgre.js

@@ -104,7 +104,7 @@ class PostgreStorage {
     saveCrowdinCredentials(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('INSERT INTO crowdin_credentials(id, app_secret, domain, user_id, organization_id, base_url, access_token, refresh_token, expire, type) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)', [
+            yield this.executeQuery((client) => client.query('INSERT INTO crowdin_credentials(id, app_secret, domain, user_id, organization_id, base_url, access_token, refresh_token, expire, type) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)', [
                 credentials.id,
                 credentials.appSecret,
                 credentials.domain,
@@ -121,7 +121,7 @@ class PostgreStorage {
     updateCrowdinCredentials(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('UPDATE crowdin_credentials SET app_secret = $1, domain = $2, user_id = $3, organization_id = $4, base_url = $5, access_token = $6, refresh_token = $7, expire = $8 WHERE id = $9', [
+            yield this.executeQuery((client) => client.query('UPDATE crowdin_credentials SET app_secret = $1, domain = $2, user_id = $3, organization_id = $4, base_url = $5, access_token = $6, refresh_token = $7, expire = $8 WHERE id = $9', [
                 credentials.appSecret,
                 credentials.domain,
                 credentials.userId,
@@ -165,7 +165,7 @@ class PostgreStorage {
     saveIntegrationCredentials(id, credentials, crowdinId) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('INSERT INTO integration_credentials(id, credentials, crowdin_id) VALUES ($1, $2, $3)', [
+            yield this.executeQuery((client) => client.query('INSERT INTO integration_credentials(id, credentials, crowdin_id) VALUES ($1, $2, $3)', [
                 id,
                 credentials,
                 crowdinId,
@@ -175,13 +175,13 @@ class PostgreStorage {
     updateIntegrationCredentials(id, credentials) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('UPDATE integration_credentials SET credentials = $1 WHERE id = $2', [credentials, id]));
+            yield this.executeQuery((client) => client.query('UPDATE integration_credentials SET credentials = $1 WHERE id = $2', [credentials, id]));
         });
     }
     updateIntegrationConfig(id, config) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('UPDATE integration_credentials SET config = $1 WHERE id = $2', [config, id]));
+            yield this.executeQuery((client) => client.query('UPDATE integration_credentials SET config = $1 WHERE id = $2', [config, id]));
         });
     }
     getIntegrationCredentials(id) {
@@ -223,13 +223,13 @@ class PostgreStorage {
     saveMetadata(id, metadata) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('INSERT INTO app_metadata(id, data) VALUES ($1, $2)', [id, JSON.stringify(metadata)]));
+            yield this.executeQuery((client) => client.query('INSERT INTO app_metadata(id, data) VALUES ($1, $2)', [id, JSON.stringify(metadata)]));
         });
     }
     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', [JSON.stringify(metadata), id]));
+            yield this.executeQuery((client) => client.query('UPDATE app_metadata SET data = $1 WHERE id = $2', [JSON.stringify(metadata), id]));
         });
     }
     getMetadata(id) {
@@ -246,7 +246,7 @@ class PostgreStorage {
     deleteMetadata(id) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('DELETE FROM app_metadata where id = $1', [id]));
+            yield this.executeQuery((client) => client.query('DELETE FROM app_metadata where id = $1', [id]));
         });
     }
     getSyncSettingsByProvider(integrationId, provider) {
@@ -270,13 +270,13 @@ class PostgreStorage {
     saveSyncSettings(files, integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES ($1, $2, $3, $4, $5)', [files, integrationId, crowdinId, type, provider]));
+            yield this.executeQuery((client) => client.query('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES ($1, $2, $3, $4, $5)', [files, integrationId, crowdinId, type, provider]));
         });
     }
     updateSyncSettings(files, integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery(client => client.query('UPDATE sync_settings SET files = $1 WHERE integration_id = $2 AND crowdin_id = $3 AND type = $4 AND provider = $5', [files, integrationId, crowdinId, type, provider]));
+            yield this.executeQuery((client) => client.query('UPDATE sync_settings SET files = $1 WHERE integration_id = $2 AND crowdin_id = $3 AND type = $4 AND provider = $5', [files, integrationId, crowdinId, type, provider]));
         });
     }
     getSyncSettings(integrationId, crowdinId, type, provider) {

package/out/storage/sqlite.js

@@ -28,7 +28,7 @@ class SQLiteStorage {
             yield new Promise((res, rej) => {
                 var _a;
                 //@ts-ignore
-                (_a = this.db) === null || _a === void 0 ? void 0 : _a.run(query, params, err => {
+                (_a = this.db) === null || _a === void 0 ? void 0 : _a.run(query, params, (err) => {
                     if (err) {
                         rej(err);
                     }
@@ -45,7 +45,7 @@ class SQLiteStorage {
             yield new Promise((res, rej) => {
                 var _a;
                 //@ts-ignore
-                (_a = this.db) === null || _a === void 0 ? void 0 : _a.run(query, params, err => {
+                (_a = this.db) === null || _a === void 0 ? void 0 : _a.run(query, params, (err) => {
                     if (err) {
                         rej(err);
                     }
@@ -118,7 +118,7 @@ class SQLiteStorage {
             });
             const sqlite = require('sqlite3');
             //@ts-ignore
-            this.db = new sqlite.Database((0, path_1.join)(this.config.dbFolder, 'app.sqlite'), error => {
+            this.db = new sqlite.Database((0, path_1.join)(this.config.dbFolder, 'app.sqlite'), (error) => {
                 if (error) {
                     _connection_rej(error);
                 }

package/out/util/connection.js

@@ -22,26 +22,27 @@ 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);
+        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);
             return {
                 accessToken: (0, _1.encryptData)(config, token.accessToken),
+                refreshToken: (0, _1.encryptData)(config, token.refreshToken),
                 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);
+        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);
         return {
             accessToken: (0, _1.encryptData)(config, token.accessToken),
-            refreshToken: (0, _1.encryptData)(config, token.refreshToken),
             expiresIn: token.expiresIn,
+            refreshToken: '',
         };
     });
 }
 function prepareCrowdinClient(config, credentials) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const isExpired = +credentials.expire < +new Date().getTime() / 1000;
+        //2 min as an extra buffer
+        const isExpired = +credentials.expire - 120 < Date.now() / 1000;
         const organization = credentials.type === models_1.AccountType.ENTERPRISE ? credentials.id : undefined;
         if (!isExpired) {
             const token = (0, _1.decryptData)(config, credentials.accessToken);
@@ -68,7 +69,7 @@ function prepareCrowdinClient(config, credentials) {
         const token = (0, _1.decryptData)(config, credentials.accessToken);
         return {
             client: new crowdin_api_client_1.default({ token, organization, baseUrl: (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.apiUrl }),
-            token: token,
+            token,
         };
     });
 }
@@ -117,14 +118,14 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
 }
 exports.prepareIntegrationCredentials = prepareIntegrationCredentials;
 const subscriptionCache = {};
-function addToCache(organization, appIdenfifier, validUntil, type, cachingSeconds, subscribeLink) {
+function addToCache(organization, appIdentifier, validUntil, type, cachingSeconds, subscribeLink) {
     if (!cachingSeconds) {
         return;
     }
     const orgCache = subscriptionCache[organization] || {};
     const now = new Date();
     now.setSeconds(now.getSeconds() + cachingSeconds);
-    orgCache[appIdenfifier] = {
+    orgCache[appIdentifier] = {
         cacheValidUntil: now,
         validUntil,
         subscribeLink,
@@ -132,8 +133,8 @@ function addToCache(organization, appIdenfifier, validUntil, type, cachingSecond
     };
     subscriptionCache[organization] = orgCache;
 }
-function getFromCache(organization, appIdenfifier) {
-    return (subscriptionCache[organization] || {})[appIdenfifier];
+function getFromCache(organization, appIdentifier) {
+    return (subscriptionCache[organization] || {})[appIdentifier];
 }
 function clearCache(organization) {
     delete subscriptionCache[organization];

package/out/util/cron.js

@@ -45,24 +45,24 @@ function runJob(config, integration, job) {
         (0, _1.log)(`Starting cron job with expression [${job.expression}]`, config.logger);
         const crowdinCredentialsList = yield (0, storage_1.getStorage)().getAllCrowdinCredentials();
         yield Promise.all(crowdinCredentialsList.map((crowdinCredentials) => __awaiter(this, void 0, void 0, function* () {
-            const { client: crowdinClient, token } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
+            const { token } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
             const { expired } = yield (0, connection_1.checkSubscription)(config, token, crowdinCredentials.id, crowdinCredentials.type);
             if (expired) {
                 (0, _1.log)(`Subscription expired. Skipping job [${job.expression}] for organization ${crowdinCredentials.id}`);
                 return;
             }
             const integrationCredentialsList = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinCredentials.id);
-            yield Promise.all(integrationCredentialsList.map((integrationCredentials) => __awaiter(this, void 0, void 0, function* () {
+            //executing in non-parallel way to properly prepare crowdin client (avoid expriration issues)
+            for (const integrationCredentials of integrationCredentialsList) {
+                const { client: crowdinClient } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
                 const projectId = crowdinAppFunctions.getProjectId(integrationCredentials.id);
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
                 const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
-                const intConfig = integrationCredentials.config
-                    ? JSON.parse(integrationCredentials.config)
-                    : undefined;
+                const intConfig = integrationCredentials.config ? JSON.parse(integrationCredentials.config) : undefined;
                 (0, _1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`, config.logger);
                 yield job.task(projectId, crowdinClient, apiCredentials, rootFolder, intConfig);
                 (0, _1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`, config.logger);
-            })));
+            }
         })));
         (0, _1.log)(`Cron job with expression [${job.expression}] completed`, config.logger);
     });
@@ -76,7 +76,7 @@ function filesCron(config, integration, period) {
             const files = JSON.parse(syncSettings.files);
             const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(syncSettings.crowdinId);
             const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(syncSettings.integrationId);
-            if (!crowdinCredentials || !integrationCredentials || !files) {
+            if (!crowdinCredentials || !integrationCredentials) {
                 return;
             }
             const intConfig = integrationCredentials.config
@@ -92,31 +92,44 @@ function filesCron(config, integration, period) {
                 (0, _1.log)(`Subscription expired. Skipping job [${period}] for organization ${crowdinCredentials.id}`);
                 return;
             }
-            const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
             const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
+            //split invocation into chunks to avoid expiration issues
+            const chunkSize = 10;
             if (syncSettings.provider === 'crowdin') {
                 const crowdinFiles = files;
                 const onlyTranslated = intConfig.condition === SyncCondition.TRANSLATED;
                 const onlyApproved = intConfig.condition === SyncCondition.APPROVED;
                 const all = intConfig.condition === SyncCondition.ALL || intConfig.condition === undefined;
-                (0, _1.log)(`Executing updateIntegration task for files cron job with period [${period}] for project ${projectId} and request ${JSON.stringify(files, null, 2)}`, config.logger);
-                if (all) {
-                    yield integration.updateIntegration(projectId, crowdinClient, apiCredentials, crowdinFiles, rootFolder, intConfig);
-                }
-                else {
-                    const filteredFiles = yield getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowdinClient, onlyApproved, onlyTranslated);
-                    if (Object.keys(filteredFiles).length === 0) {
+                const filesToProcess = all
+                    ? crowdinFiles
+                    : yield getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowdinClient, onlyApproved, onlyTranslated);
+                (0, _1.log)(`Executing updateIntegration task for files cron job with period [${period}] for project ${projectId}.Files ${Object.keys(filesToProcess).length}`, config.logger);
+                if (!all) {
+                    if (Object.keys(filesToProcess).length === 0) {
                         (0, _1.log)(`There is no ${onlyApproved ? 'approved' : 'translated'} file`, config.logger);
                         return;
                     }
-                    yield integration.updateIntegration(projectId, crowdinClient, apiCredentials, filteredFiles, rootFolder, intConfig);
+                }
+                const filesArr = Object.keys(filesToProcess);
+                for (let i = 0; i < filesArr.length; i += chunkSize) {
+                    const chunk = filesArr.slice(i, i + chunkSize);
+                    const filesChunk = {};
+                    chunk.forEach((f) => (filesChunk[f] = filesToProcess[f]));
+                    const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+                    const { client } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
+                    yield integration.updateIntegration(projectId, client, apiCredentials, filesChunk, rootFolder, intConfig);
                 }
                 (0, _1.log)(`updateIntegration task for files cron job with period [${period}] for project ${projectId} completed`, config.logger);
             }
             else {
                 const intFiles = files;
-                (0, _1.log)(`Executing updateCrowdin task for files cron job with period [${period}] for project ${projectId} and request ${JSON.stringify(files, null, 2)}`, config.logger);
-                yield integration.updateCrowdin(projectId, crowdinClient, apiCredentials, intFiles, rootFolder, intConfig);
+                (0, _1.log)(`Executing updateCrowdin task for files cron job with period [${period}] for project ${projectId}. Files ${intFiles.length}`, config.logger);
+                for (let i = 0; i < intFiles.length; i += chunkSize) {
+                    const chunk = intFiles.slice(i, i + chunkSize);
+                    const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+                    const { client } = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
+                    yield integration.updateCrowdin(projectId, client, apiCredentials, chunk, rootFolder, intConfig);
+                }
                 (0, _1.log)(`updateCrowdin task for files cron job with period [${period}] for project ${projectId} completed`, config.logger);
             }
         })));
@@ -133,18 +146,18 @@ function getOnlyTranslatedOrApprovedFiles(config, projectId, crowdinFiles, crowd
                 .getFileProgress(projectId, Number(fileId));
             return {
                 id: fileId,
-                info: res.data.map(e => e.data),
+                info: res.data.map((e) => e.data),
             };
         })));
         const filteredFiles = {};
-        Object.keys(crowdinFiles).forEach(fileId => {
-            const fileInfo = filesInfo.find(info => info.id === fileId);
+        Object.keys(crowdinFiles).forEach((fileId) => {
+            const fileInfo = filesInfo.find((info) => info.id === fileId);
             if (!fileInfo) {
                 return;
             }
             const languages = crowdinFiles[fileId];
-            languages.forEach(language => {
-                const languageInfo = fileInfo.info.find(info => info.languageId === language);
+            languages.forEach((language) => {
+                const languageInfo = fileInfo.info.find((info) => info.languageId === language);
                 if (!languageInfo) {
                     return;
                 }

package/out/util/defaults.js

@@ -36,7 +36,7 @@ function getRootFolder(config, integration, client, projectId) {
             return;
         }
         const folder = integration.appFolderName || config.name;
-        const directories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId)).data.map(d => d.data);
+        const directories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId)).data.map((d) => d.data);
         const { folder: rootFolder } = yield crowdinAppFunctions.getOrCreateFolder(directories, client, projectId, folder);
         return rootFolder;
     });
@@ -55,18 +55,18 @@ function applyDefaults(config, integration) {
                 allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, {
                     directoryId: rootFolder.id,
                     recursion: 'true',
-                })).data.map(d => d.data);
+                })).data.map((d) => d.data);
             }
             else {
-                allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId)).data.map(d => d.data);
+                allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId)).data.map((d) => d.data);
             }
-            const directoryIds = allDirectories.map(d => d.id);
-            let files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId)).data.map(d => d.data);
-            files = files.filter(f => (rootFolder && f.directoryId === rootFolder.id) ||
+            const directoryIds = allDirectories.map((d) => d.id);
+            let files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId)).data.map((d) => d.data);
+            files = files.filter((f) => (rootFolder && f.directoryId === rootFolder.id) ||
                 directoryIds.includes(f.directoryId) ||
                 (!rootFolder && !f.directoryId));
             const res = [];
-            allDirectories.forEach(e => {
+            allDirectories.forEach((e) => {
                 const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
                 res.push({
                     id: e.id.toString(),
@@ -74,7 +74,7 @@ function applyDefaults(config, integration) {
                     name: e.name,
                 });
             });
-            files.forEach(e => {
+            files.forEach((e) => {
                 const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
                 res.push({
                     id: e.id.toString(),

package/out/views/login.handlebars

@@ -143,10 +143,10 @@
             )
             .then(checkResponse)
             .then(reloadLocation)
-            .catch(e => catchRejection(e, 'Credentials are not stored'))
-            .finally(() => {
+            .catch(e => {
                 loginButton.setAttribute('disabled', false);
                 loginButton.setAttribute('is-loading', false);
+                catchRejection(e, 'Credentials are not stored');
             });
     }
 

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.23.5",
+  "version": "0.24.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
   "scripts": {
     "build": "tsc -p ./ && cp -R views out && cp -R static out && cp logo.png out",
     "lint": "eslint --fix \"{src,tests}/**/*.{js,ts}\"",
+    "prettier": "prettier --config .prettierrc src/**/*.ts --write",
     "lint-ci": "eslint \"{src,tests}/**/*.{js,ts}\"",
-    "test-coverage": "echo \"test-coverage not implemented\"",
-    "test": "echo \"test not implemented\""
+    "test-coverage": "jest --config jestconfig.json --ci --reporters=jest-junit --reporters=default --coverage --coverageReporters=cobertura --coverageReporters=html",
+    "test": "jest --config jestconfig.json"
   },
   "dependencies": {
     "@crowdin/crowdin-apps-functions": "~0.2.1",
@@ -27,6 +28,7 @@
     "@types/crypto-js": "^4.0.0",
     "@types/express": "4.17.13",
     "@types/express-handlebars": "^5.3.1",
+    "@types/jest": "^29.2.5",
     "@types/node": "^12.0.10",
     "@types/node-cron": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.3.1",
@@ -34,8 +36,10 @@
     "eslint": "^6.4.0",
     "eslint-config-prettier": "^6.3.0",
     "eslint-plugin-prettier": "^3.1.1",
-    "lint-staged": ">=8",
-    "prettier": "^1.18.2",
+    "jest": "^29.3.1",
+    "jest-junit": "^15.0.0",
+    "prettier": "^2.8.1",
+    "ts-jest": "^29.0.3",
     "typescript": "^4.4.4"
   },
   "repository": {
@@ -48,6 +52,12 @@
     "Applications",
     "App"
   ],
+  "jest": {
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ]
+  },
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/crowdin/app-project-module/issues"