@crowdin/app-project-module 0.16.4 → 0.17.0

package/out/handlers/install.js

@@ -20,6 +20,11 @@ function handle(config) {
         const token = yield (0, crowdin_apps_functions_1.generateOAuthToken)(config.clientId, config.clientSecret, event.code);
         const credentials = {
             id: (event.domain || event.organizationId).toString(),
+            appSecret: event.appSecret,
+            domain: event.domain,
+            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),
             expire: (new Date().getTime() / 1000 + token.expiresIn).toString(),

package/out/models/index.d.ts

@@ -326,6 +326,11 @@ export interface CrowdinClientRequest extends Request {
 }
 export interface CrowdinCredentials {
     id: string;
+    appSecret: string;
+    domain?: string;
+    userId: number;
+    organizationId: number;
+    baseUrl: string;
     accessToken: string;
     refreshToken: string;
     expire: string;

package/out/storage/index.js

@@ -37,6 +37,67 @@ function _run(query, params) {
         });
     });
 }
+function run(query, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield dbPromise;
+        return new Promise((res, rej) => {
+            db.run(query, params, err => {
+                if (err) {
+                    rej(err);
+                }
+                else {
+                    res();
+                }
+            });
+        });
+    });
+}
+function get(query, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield dbPromise;
+        return new Promise((res, rej) => {
+            db.get(query, params, (err, row) => {
+                if (err) {
+                    rej(err);
+                }
+                else {
+                    res(row);
+                }
+            });
+        });
+    });
+}
+function each(query, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield dbPromise;
+        return new Promise((res, rej) => {
+            const result = [];
+            db.each(query, params, (err, row) => {
+                if (err) {
+                    rej(err);
+                }
+                else {
+                    result.push(row);
+                }
+            }, () => res(result));
+        });
+    });
+}
+function migrate() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const newColumns = ['app_secret', 'domain', 'userId', 'organizationId', 'baseUrl'];
+        const crowdinCredentialsInfo = yield each('PRAGMA table_info(crowdin_credentials);', []);
+        crowdinCredentialsInfo.map((columnInfo) => __awaiter(this, void 0, void 0, function* () {
+            const index = newColumns.indexOf(columnInfo.name);
+            if (~index) {
+                newColumns.splice(index, 1);
+            }
+        }));
+        for (const column of newColumns) {
+            yield run(`ALTER TABLE crowdin_credentials ADD COLUMN ${column} varchar null;`, []);
+        }
+    });
+}
 function connect(folder) {
     return __awaiter(this, void 0, void 0, function* () {
         let _connection_res;
@@ -58,11 +119,16 @@ function connect(folder) {
             yield _run(`
             create table if not exists crowdin_credentials
             (
-                id            varchar not null primary key,
-                access_token  varchar not null,
-                refresh_token varchar not null,
-                expire        varchar not null,
-                type          varchar not null
+                id             varchar not null primary key,
+                app_secret     varchar     null,
+                domain         varchar     null,
+                userId         varchar     null,
+                organizationId varchar     null,
+                baseUrl        varchar     null,
+                access_token   varchar not null,
+                refresh_token  varchar not null,
+                expire         varchar not null,
+                type           varchar not null
             );
             `, []);
             yield _run(`
@@ -93,6 +159,8 @@ function connect(folder) {
             );
             `, []);
             _res();
+            // TODO: temporary code
+            yield migrate();
         }
         catch (e) {
             _rej(e);
@@ -100,58 +168,27 @@ function connect(folder) {
     });
 }
 exports.connect = connect;
-function run(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield dbPromise;
-        return new Promise((res, rej) => {
-            db.run(query, params, err => {
-                if (err) {
-                    rej(err);
-                }
-                else {
-                    res();
-                }
-            });
-        });
-    });
-}
-function get(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield dbPromise;
-        return new Promise((res, rej) => {
-            db.get(query, params, (err, row) => {
-                if (err) {
-                    rej(err);
-                }
-                else {
-                    res(row);
-                }
-            });
-        });
-    });
-}
-function each(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield dbPromise;
-        return new Promise((res, rej) => {
-            const result = [];
-            db.each(query, params, (err, row) => {
-                if (err) {
-                    rej(err);
-                }
-                else {
-                    result.push(row);
-                }
-            }, () => res(result));
-        });
-    });
-}
 function saveCrowdinCredentials(credentials) {
-    return run('INSERT INTO crowdin_credentials(id, access_token, refresh_token, expire, type) VALUES (?, ?, ?, ?, ?)', [credentials.id, credentials.accessToken, credentials.refreshToken, credentials.expire, credentials.type]);
+    return run('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,
+        credentials.userId,
+        credentials.organizationId,
+        credentials.baseUrl,
+        credentials.accessToken,
+        credentials.refreshToken,
+        credentials.expire,
+    ]);
 }
 exports.saveCrowdinCredentials = saveCrowdinCredentials;
 function updateCrowdinCredentials(credentials) {
-    return run('UPDATE crowdin_credentials SET access_token = ?, refresh_token = ?, expire = ? WHERE id = ?', [
+    return run('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,
+        credentials.organizationId,
+        credentials.baseUrl,
         credentials.accessToken,
         credentials.refreshToken,
         credentials.expire,
@@ -161,7 +198,7 @@ function updateCrowdinCredentials(credentials) {
 exports.updateCrowdinCredentials = updateCrowdinCredentials;
 function getCrowdinCredentials(id) {
     return __awaiter(this, void 0, void 0, function* () {
-        const row = yield get('SELECT id, access_token as accessToken, refresh_token as refreshToken, expire, type FROM crowdin_credentials WHERE id = ?', [id]);
+        const row = yield get('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]);
         if (row) {
             return row;
         }
@@ -170,7 +207,7 @@ function getCrowdinCredentials(id) {
 exports.getCrowdinCredentials = getCrowdinCredentials;
 function getAllCrowdinCredentials() {
     return __awaiter(this, void 0, void 0, function* () {
-        return each('SELECT id, access_token as accessToken, refresh_token as refreshToken, expire, type FROM crowdin_credentials', []);
+        return each('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', []);
     });
 }
 exports.getAllCrowdinCredentials = getAllCrowdinCredentials;

package/out/util/connection.js

@@ -56,6 +56,11 @@ function prepareCrowdinClient(config, credentials) {
         (0, _1.log)('Saving updated crowdin credentials in the database', config.logger);
         yield (0, storage_1.updateCrowdinCredentials)({
             id: credentials.id,
+            appSecret: credentials.appSecret,
+            domain: credentials.domain,
+            userId: credentials.userId,
+            organizationId: credentials.organizationId,
+            baseUrl: credentials.baseUrl,
             refreshToken: (0, _1.encryptData)(config, newCredentials.refreshToken),
             accessToken: (0, _1.encryptData)(config, newCredentials.accessToken),
             expire: (new Date().getTime() / 1000 + newCredentials.expiresIn).toString(),
@@ -180,7 +185,7 @@ function checkSubscription(config, token, organization, accountType) {
                 //default 2 weeks
                 const defaultSubscriptionPlan = 14;
                 let days;
-                if (organization) {
+                if (accountType === models_1.AccountType.ENTERPRISE) {
                     days = ((_b = config.pricing) === null || _b === void 0 ? void 0 : _b.trialEnterprise) || ((_c = config.pricing) === null || _c === void 0 ? void 0 : _c.trial) || defaultSubscriptionPlan;
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.16.4",
+  "version": "0.17.0",
   "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.2",
+    "@crowdin/crowdin-apps-functions": "0.1.3",
     "crypto-js": "^4.0.0",
     "express": "4.17.1",
     "express-handlebars": "^5.3.4",