@crowdin/app-project-module 0.15.1 → 0.15.3

package/out/handlers/install.js

@@ -20,8 +20,8 @@ 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(),
-            accessToken: (0, util_1.encryptData)(config.clientSecret, token.accessToken),
-            refreshToken: (0, util_1.encryptData)(config.clientSecret, token.refreshToken),
+            accessToken: (0, util_1.encryptData)(config, token.accessToken),
+            refreshToken: (0, util_1.encryptData)(config, token.refreshToken),
             expire: (new Date().getTime() / 1000 + token.expiresIn).toString(),
             type: event.domain ? models_1.AccountType.ENTERPRISE : models_1.AccountType.NORMAL,
         };

package/out/handlers/integration-login.js

@@ -23,7 +23,7 @@ function handle(config, integration) {
             (0, util_1.log)('Deleting old credentials', config.logger);
             yield (0, storage_1.deleteIntegrationCredentials)(req.crowdinContext.clientId);
         }
-        yield (0, storage_1.saveIntegrationCredentials)(req.crowdinContext.clientId, (0, util_1.encryptData)(config.clientSecret, JSON.stringify(req.body.credentials)), req.crowdinContext.crowdinId);
+        yield (0, storage_1.saveIntegrationCredentials)(req.crowdinContext.clientId, (0, util_1.encryptData)(config, JSON.stringify(req.body.credentials)), req.crowdinContext.crowdinId);
         res.status(204).end();
     }), config.onError);
 }

package/out/handlers/integration-logout.js

@@ -11,10 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../storage");
 const util_1 = require("../util");
+const connection_1 = require("../util/connection");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         (0, util_1.log)('Recieved integration logout request', config.logger);
         yield (0, storage_1.deleteIntegrationCredentials)(req.crowdinContext.clientId);
+        (0, connection_1.clearCache)(req.crowdinContext.crowdinId);
         res.status(204).end();
     }), config.onError);
 }

package/out/models/index.d.ts

@@ -10,6 +10,10 @@ export interface Config extends ImagePath {
      * client secret that we received when registering the app
      */
     clientSecret: string;
+    /**
+     * Secret to encrypt/decrypt credentials (by default @clientSecret will be used)
+     */
+    cryptoSecret?: string;
     /**
      * https url where an app is reachable from the internet (e.g. the one that ngrok generates for us)
      */

package/out/util/connection.d.ts

@@ -5,6 +5,7 @@ export declare function prepareCrowdinClient(config: Config, credentials: Crowdi
     token: string;
 }>;
 export declare function prepareIntegrationCredentials(config: Config, integration: IntegrationLogic, integrationCredentials: IntegrationCredentials): Promise<any>;
+export declare function clearCache(organization: string): void;
 export declare function checkSubscription(config: Config, token: string, organization: string, accountType: AccountType): Promise<{
     expired: boolean;
     subscribeLink?: string;

package/out/util/connection.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSubscription = exports.prepareIntegrationCredentials = exports.prepareCrowdinClient = void 0;
+exports.checkSubscription = 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 axios_1 = __importDefault(require("axios"));
@@ -45,19 +45,19 @@ function prepareCrowdinClient(config, credentials) {
         let token;
         const organization = credentials.type === models_1.AccountType.ENTERPRISE ? credentials.id : undefined;
         if (!isExpired) {
-            const token = (0, _1.decryptData)(config.clientSecret, credentials.accessToken);
+            const token = (0, _1.decryptData)(config, credentials.accessToken);
             return {
                 client: new crowdin_api_client_1.default({ token, organization }),
                 token,
             };
         }
         (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.clientSecret, credentials.refreshToken));
+        const newCredentials = yield crowdinAppFunctions.refreshOAuthToken(config.clientId, config.clientSecret, (0, _1.decryptData)(config, credentials.refreshToken));
         (0, _1.log)('Saving updated crowdin credentials in the database', config.logger);
         yield (0, storage_1.updateCrowdinCredentials)({
             id: credentials.id,
-            refreshToken: (0, _1.encryptData)(config.clientSecret, newCredentials.refreshToken),
-            accessToken: (0, _1.encryptData)(config.clientSecret, newCredentials.accessToken),
+            refreshToken: (0, _1.encryptData)(config, newCredentials.refreshToken),
+            accessToken: (0, _1.encryptData)(config, newCredentials.accessToken),
             expire: (new Date().getTime() / 1000 + newCredentials.expiresIn).toString(),
             type: credentials.type,
         });
@@ -71,7 +71,7 @@ exports.prepareCrowdinClient = prepareCrowdinClient;
 function prepareIntegrationCredentials(config, integration, integrationCredentials) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function* () {
-        const credentials = JSON.parse((0, _1.decryptData)(config.clientSecret, integrationCredentials.credentials));
+        const credentials = JSON.parse((0, _1.decryptData)(config, integrationCredentials.credentials));
         if ((_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.refresh) {
             (0, _1.log)('Checking if integration credentials need to be refreshed', config.logger);
             const oauthLogin = integration.oauthLogin;
@@ -104,7 +104,7 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
                     credentials.refreshToken = newCredentials[((_h = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _h === void 0 ? void 0 : _h.refreshToken) || 'refresh_token'];
                 }
                 (0, _1.log)('Saving updated integration credentials in the database', config.logger);
-                yield (0, storage_1.updateIntegrationCredentials)(integrationCredentials.id, (0, _1.encryptData)(config.clientSecret, JSON.stringify(credentials)));
+                yield (0, storage_1.updateIntegrationCredentials)(integrationCredentials.id, (0, _1.encryptData)(config, JSON.stringify(credentials)));
             }
         }
         return credentials;
@@ -112,18 +112,27 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
 }
 exports.prepareIntegrationCredentials = prepareIntegrationCredentials;
 const subscriptionCache = {};
-function addToCache(organization, validUntil, cachingSeconds, subscribeLink) {
+function addToCache(organization, appIdenfifier, validUntil, cachingSeconds, subscribeLink) {
     if (!cachingSeconds) {
         return;
     }
+    const orgCache = subscriptionCache[organization] || {};
     const now = new Date();
     now.setSeconds(now.getSeconds() + cachingSeconds);
-    subscriptionCache[organization] = {
+    orgCache[appIdenfifier] = {
         cacheValidUntil: now,
         validUntil,
         subscribeLink,
     };
+    subscriptionCache[organization] = orgCache;
 }
+function getFromCache(organization, appIdenfifier) {
+    return (subscriptionCache[organization] || {})[appIdenfifier];
+}
+function clearCache(organization) {
+    delete subscriptionCache[organization];
+}
+exports.clearCache = clearCache;
 function checkSubscription(config, token, organization, accountType) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!config.pricing || config.pricing.planType === 'free') {
@@ -139,8 +148,10 @@ function checkSubscription(config, token, organization, accountType) {
             days = config.pricing.trialCrowdin || config.pricing.trial || defaultSubscriptionPlan;
         }
         (0, _1.log)(`Checking subscription plan. Subscriptino plan ${days} days`, config.logger);
-        if (subscriptionCache[organization]) {
-            const { cacheValidUntil, validUntil, subscribeLink } = subscriptionCache[organization];
+        const appIdentifier = config.identifier;
+        const cacheEntry = getFromCache(organization, appIdentifier);
+        if (cacheEntry) {
+            const { cacheValidUntil, validUntil, subscribeLink } = cacheEntry;
             if (cacheValidUntil.getTime() > Date.now()) {
                 (0, _1.log)(`Loaded data from cache. Subscription is vali until ${validUntil.toISOString()}`, config.logger);
                 const expired = new Date(validUntil).getTime() < Date.now();
@@ -149,7 +160,6 @@ function checkSubscription(config, token, organization, accountType) {
             }
         }
         try {
-            const appIdentifier = config.identifier;
             const subscription = yield crowdinAppFunctions.getSubscription({
                 appIdentifier,
                 organization: accountType === models_1.AccountType.ENTERPRISE ? organization : undefined,
@@ -158,7 +168,7 @@ function checkSubscription(config, token, organization, accountType) {
             (0, _1.log)(`Recieved subscription info. ${JSON.stringify(subscription)}`, config.logger);
             const expired = new Date(subscription.expires).getTime() < Date.now();
             (0, _1.log)(`expired ${expired}`, config.logger);
-            addToCache(organization, new Date(subscription.expires), config.pricing.cachingSeconds);
+            addToCache(organization, appIdentifier, new Date(subscription.expires), config.pricing.cachingSeconds);
             return { expired };
         }
         catch (e) {
@@ -169,7 +179,7 @@ function checkSubscription(config, token, organization, accountType) {
                 date.setDate(date.getDate() + days);
                 const expired = date.getTime() < Date.now();
                 (0, _1.log)(`expired ${expired}`, config.logger);
-                addToCache(organization, new Date(date), config.pricing.cachingSeconds, subscribeLink);
+                addToCache(organization, appIdentifier, new Date(date), config.pricing.cachingSeconds, subscribeLink);
                 return { expired, subscribeLink };
             }
             if (config.onError) {

package/out/util/index.d.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { Logger } from '../models';
+import { Config, Logger } from '../models';
 export declare class CodeError extends Error {
     code: number | undefined;
     constructor(message: string, code?: number);
@@ -7,5 +7,5 @@ export declare class CodeError extends Error {
 export declare function log(message: string, logger?: Logger): void;
 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(secret: string, data: string): string;
-export declare function decryptData(secret: string, data: string): string;
+export declare function encryptData(config: Config, data: string): string;
+export declare function decryptData(config: Config, data: string): string;

package/out/util/index.js

@@ -95,11 +95,11 @@ function runAsyncWrapper(callback, onError) {
     };
 }
 exports.runAsyncWrapper = runAsyncWrapper;
-function encryptData(secret, data) {
-    return crypto.AES.encrypt(data, secret).toString();
+function encryptData(config, data) {
+    return crypto.AES.encrypt(data, config.cryptoSecret || config.clientSecret).toString();
 }
 exports.encryptData = encryptData;
-function decryptData(secret, data) {
-    return crypto.AES.decrypt(data, secret).toString(crypto.enc.Utf8);
+function decryptData(config, data) {
+    return crypto.AES.decrypt(data, config.cryptoSecret || config.clientSecret).toString(crypto.enc.Utf8);
 }
 exports.decryptData = decryptData;

package/package.json

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