@crowdin/app-project-module 0.95.3 → 0.96.0

package/out/storage/mysql.d.ts

@@ -78,7 +78,7 @@ export declare class MySQLStorage implements Storage {
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, title, payload }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt, errors }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;

package/out/storage/mysql.js

@@ -139,6 +139,7 @@ class MySQLStorage {
             info            text,
             data            text,
             attempt         int 0,
+            errors          text,
             created_at      varchar(255) not null,
             updated_at      varchar(255),
             finished_at     varchar(255)
@@ -605,7 +606,7 @@ class MySQLStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data, attempt }) {
+    updateJob({ id, progress, status, info, data, attempt, errors }) {
         return __awaiter(this, void 0, void 0, function* () {
             const updateFields = ['updated_at'];
             const updateParams = [Date.now().toString()];
@@ -637,6 +638,10 @@ class MySQLStorage {
                 updateFields.push('attempt = ?');
                 updateParams.push(attempt);
             }
+            if (errors) {
+                updateFields.push('errors = ?');
+                updateParams.push(JSON.stringify(errors));
+            }
             updateParams.push(id);
             yield this.dbPromise;
             yield this.executeQuery((connection) => connection.execute(`
@@ -662,6 +667,7 @@ class MySQLStorage {
                          info,
                          data,
                          attempt,
+                         errors,
                          created_at     as "createdAt",
                          updated_at     as "updatedAt",
                          finished_at    as "finishedAt"
@@ -688,6 +694,7 @@ class MySQLStorage {
                          info,
                          data,
                          attempt,
+                         errors,
                          created_at     as "createdAt",
                          updated_at     as "updatedAt",
                          finished_at    as "finishedAt"
@@ -722,6 +729,7 @@ class MySQLStorage {
                          info,
                          data,
                          attempt,
+                         errors,
                          created_at     as "createdAt",
                          updated_at     as "updatedAt",
                          finished_at    as "finishedAt"

package/out/storage/postgre.d.ts

@@ -88,7 +88,7 @@ export declare class PostgreStorage implements Storage {
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, payload, title }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt, errors }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;

package/out/storage/postgre.js

@@ -102,6 +102,7 @@ class PostgreStorage {
             info            varchar     null,
             data            varchar     null,
             attempt         int default 0,
+            errors          varchar     null,
             created_at      varchar not null,
             updated_at      varchar     null,
             finished_at     varchar     null
@@ -224,6 +225,7 @@ class PostgreStorage {
             yield this.addColumns(client, ['crowdin_id'], 'app_metadata');
             yield this.addColumns(client, ['agent_id'], 'crowdin_credentials');
             yield this.addColumn(client, 'attempt', 'job', 'int default 0');
+            yield this.addColumn(client, 'errors', 'job', 'varchar NULL');
             yield this.addColumn(client, 'managers', 'integration_credentials', 'varchar NULL');
         });
     }
@@ -642,7 +644,7 @@ class PostgreStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data, attempt }) {
+    updateJob({ id, progress, status, info, data, attempt, errors }) {
         return __awaiter(this, void 0, void 0, function* () {
             let parametersPointer = 1;
             const updateFields = [`updated_at = $${parametersPointer}`];
@@ -682,6 +684,11 @@ class PostgreStorage {
                 updateFields.push('attempt = $' + parametersPointer);
                 updateParams.push(attempt);
             }
+            if (errors) {
+                parametersPointer++;
+                updateFields.push('errors = $' + parametersPointer);
+                updateParams.push(JSON.stringify(errors));
+            }
             parametersPointer++;
             updateParams.push(id);
             yield this.dbPromise;
@@ -698,7 +705,7 @@ class PostgreStorage {
             return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield client.query(`
                 SELECT id, integration_id as "integrationId", crowdin_id as "crowdinId", type, payload, progress, status,
-                    title, info, data, attempt, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
+                    title, info, data, attempt, errors, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
                 FROM job
                 WHERE id = $1
                 `, [id]);
@@ -712,7 +719,7 @@ class PostgreStorage {
             return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield client.query(`
                 SELECT id, integration_id as "integrationId", crowdin_id as "crowdinId", type, payload, progress, status,
-                    title, info, data, attempt, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
+                    title, info, data, attempt, errors, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
                 FROM job
                 WHERE integration_id = $1 AND crowdin_id = $2 AND finished_at is NULL
                 `, [integrationId, crowdinId]);
@@ -732,7 +739,7 @@ class PostgreStorage {
             return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield client.query(`
                 SELECT id, integration_id as "integrationId", crowdin_id as "crowdinId", type, payload, progress, status,
-                    title, info, data, attempt, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
+                    title, info, data, attempt, errors, created_at as "createdAt", updated_at as "updatedAt", finished_at as "finishedAt"
                 FROM job
                 WHERE status IN ($1, $2) AND finished_at is NULL
                 `, [types_2.JobStatus.IN_PROGRESS, types_2.JobStatus.CREATED]);

package/out/storage/sqlite.d.ts

@@ -76,7 +76,7 @@ export declare class SQLiteStorage implements Storage {
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, title, payload }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt, errors }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;

package/out/storage/sqlite.js

@@ -98,6 +98,7 @@ class SQLiteStorage {
             info           varchar     null,
             data           varchar     null,
             attempt        varchar DEFAULT 0,
+            errors         varchar     null,
             created_at     varchar not null,
             updated_at     varchar     null,
             finished_at    varchar     null
@@ -234,6 +235,7 @@ class SQLiteStorage {
             yield this.addColumns(['app_secret', 'domain', 'user_id', 'agent_id', 'organization_id', 'base_url'], 'crowdin_credentials');
             yield this.addColumns(['crowdin_id'], 'app_metadata');
             yield this.addColumn('job', 'attempt', 'DEFAULT 0');
+            yield this.addColumn('job', 'errors', 'null');
             yield this.addColumn('integration_credentials', 'managers', 'null');
         });
     }
@@ -575,7 +577,7 @@ class SQLiteStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data, attempt }) {
+    updateJob({ id, progress, status, info, data, attempt, errors }) {
         const updateFields = ['updated_at = ?'];
         const updateParams = [Date.now().toString()];
         if (progress) {
@@ -606,6 +608,10 @@ class SQLiteStorage {
             updateFields.push('attempt = ?');
             updateParams.push(attempt);
         }
+        if (errors) {
+            updateFields.push('errors = ?');
+            updateParams.push(JSON.stringify(errors));
+        }
         updateParams.push(id);
         const query = `
             UPDATE job
@@ -618,7 +624,7 @@ class SQLiteStorage {
         return __awaiter(this, void 0, void 0, function* () {
             const row = yield this.get(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, errors, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE id = ?
             `, [id]);
@@ -630,7 +636,7 @@ class SQLiteStorage {
     getActiveJobs({ integrationId, crowdinId }) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.each(`
-                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, errors, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE integration_id = ? AND crowdin_id = ? AND finished_at is NULL
             `, [integrationId, crowdinId]);
@@ -644,7 +650,7 @@ class SQLiteStorage {
     getAllInProgressJobs() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.each(`
-                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, errors, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE status IN (?,?) AND finished_at is NULL
             `, [types_2.JobStatus.IN_PROGRESS, types_2.JobStatus.CREATED]);

package/out/util/connection.js

@@ -218,50 +218,64 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, context,
 }
 exports.prepareCrowdinClient = prepareCrowdinClient;
 function prepareIntegrationCredentials(config, integration, integrationCredentials) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         const credentials = JSON.parse((0, _1.decryptData)(config, integrationCredentials.credentials));
         credentials.ownerId = crowdinAppFunctions.parseCrowdinId(integrationCredentials.id).userId;
         const oauthLogin = integration.oauthLogin;
         const integrationLogin = integration.loginForm;
+        // Add tokenProvider function to credentials for dynamic token refresh
         if ((oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.refresh) || (integrationLogin === null || integrationLogin === void 0 ? void 0 : integrationLogin.refresh)) {
-            (0, logger_1.log)('Checking if integration credentials need to be refreshed');
-            const { expireIn } = credentials;
-            //2 min as an extra buffer
-            const isExpired = !expireIn || expireIn - 120 < Date.now() / 1000;
             const performRefreshTokenRequest = (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.performRefreshTokenRequest) || (integrationLogin === null || integrationLogin === void 0 ? void 0 : integrationLogin.performRefreshTokenRequest);
-            if (isExpired) {
-                (0, logger_1.log)('Integration credentials have expired. Requesting a new credentials');
-                let newCredentials;
-                if (performRefreshTokenRequest) {
-                    const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(integrationCredentials.id));
-                    newCredentials = yield performRefreshTokenRequest(credentials, loginForm);
-                }
-                else if (oauthLogin) {
-                    const url = oauthLogin.refreshTokenUrl || oauthLogin.accessTokenUrl;
-                    const request = {};
-                    request[((_a = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _a === void 0 ? void 0 : _a.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
-                    request[((_b = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _b === void 0 ? void 0 : _b.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
-                    request[((_c = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _c === void 0 ? void 0 : _c.refreshToken) || 'refresh_token'] = credentials.refreshToken;
-                    if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters) {
-                        Object.entries(oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters).forEach(([key, value]) => (request[key] = value));
+            credentials.tokenProvider = {
+                getToken: (force = false) => __awaiter(this, void 0, void 0, function* () {
+                    var _a, _b, _c, _d, _e, _f, _g;
+                    const { expireIn } = credentials;
+                    //2 min as an extra buffer
+                    const isExpired = !expireIn || expireIn - 120 < Date.now() / 1000;
+                    if (!force && !isExpired) {
+                        return credentials.accessToken;
                     }
-                    newCredentials = (yield axios_1.default.post(url || '', request, {
-                        headers: { Accept: 'application/json' },
-                    })).data;
-                }
-                else {
-                    return credentials;
-                }
-                credentials.accessToken = newCredentials[((_d = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _d === void 0 ? void 0 : _d.accessToken) || 'access_token'];
-                credentials.expireIn =
-                    Number(newCredentials[((_e = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _e === void 0 ? void 0 : _e.expiresIn) || 'expires_in']) + Date.now() / 1000;
-                if (newCredentials[((_f = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _f === void 0 ? void 0 : _f.refreshToken) || 'refresh_token']) {
-                    credentials.refreshToken = newCredentials[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.refreshToken) || 'refresh_token'];
-                }
-                (0, logger_1.log)('Saving updated integration credentials in the database');
-                yield (0, storage_1.getStorage)().updateIntegrationCredentials(integrationCredentials.id, (0, _1.encryptData)(config, JSON.stringify(credentials)));
-            }
+                    (0, logger_1.log)(force
+                        ? 'Force refreshing integration credentials'
+                        : 'Integration credentials have expired during operation. Requesting a new credentials');
+                    let newCredentials;
+                    if (performRefreshTokenRequest) {
+                        const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(integrationCredentials.id));
+                        newCredentials = yield performRefreshTokenRequest(credentials, loginForm);
+                    }
+                    else if (oauthLogin) {
+                        const url = oauthLogin.refreshTokenUrl || oauthLogin.accessTokenUrl;
+                        const request = {};
+                        request[((_a = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _a === void 0 ? void 0 : _a.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
+                        request[((_b = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _b === void 0 ? void 0 : _b.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
+                        request[((_c = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _c === void 0 ? void 0 : _c.refreshToken) || 'refresh_token'] = credentials.refreshToken;
+                        if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters) {
+                            Object.entries(oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters).forEach(([key, value]) => (request[key] = value));
+                        }
+                        newCredentials = (yield axios_1.default.post(url || '', request, {
+                            headers: { Accept: 'application/json' },
+                        })).data;
+                    }
+                    else {
+                        return credentials.accessToken;
+                    }
+                    credentials.accessToken = newCredentials[((_d = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _d === void 0 ? void 0 : _d.accessToken) || 'access_token'];
+                    credentials.expireIn =
+                        Number(newCredentials[((_e = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _e === void 0 ? void 0 : _e.expiresIn) || 'expires_in']) + Date.now() / 1000;
+                    if (newCredentials[((_f = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _f === void 0 ? void 0 : _f.refreshToken) || 'refresh_token']) {
+                        credentials.refreshToken =
+                            newCredentials[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.refreshToken) || 'refresh_token'];
+                    }
+                    (0, logger_1.log)('Saving updated integration credentials in the database');
+                    yield (0, storage_1.getStorage)().updateIntegrationCredentials(integrationCredentials.id, (0, _1.encryptData)(config, JSON.stringify(credentials)));
+                    return credentials.accessToken;
+                }),
+                refreshToken: () => {
+                    return credentials.tokenProvider.getToken(true);
+                },
+            };
+            (0, logger_1.log)('Checking if integration credentials need to be refreshed');
+            yield credentials.tokenProvider.getToken();
         }
         return credentials;
     });

package/out/util/index.js

@@ -64,7 +64,7 @@ function handleError(err, req, res) {
                 res.render('error', errorMessage);
             }
             else {
-                res.status(code).send(errorMessage);
+                res.status(code).send({ error: errorMessage });
             }
         }
     });

package/package.json

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