@crowdin/app-project-module 0.15.0 → 0.15.2

package/README.md

@@ -185,7 +185,7 @@ configuration.pricing = {
     plantType: 'recurring',
     trial: 14, //amount of days to use app for free
     trialCrowdin: 14, //amount of days specifically in crowdin workspace
-    trialEnterprise: 30 //amount of days specifically for enterprise
+    trialEnterprise: 30, //amount of days specifically for enterprise
     cachingSeconds: 12 * 60 * 60 //time in seconds of how long to cache subscription info
 };
 ```

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/index.js

@@ -92,7 +92,7 @@ function addCrowdinEndpoints(app, config) {
     app.post('/installed', (0, install_1.default)(config));
     app.post('/uninstall', (0, uninstall_1.default)(config));
     app.get('/manifest.json', json_response_1.default, (0, manifest_1.default)(config));
-    const integrationLogic = config.integration || config.projectIntegration;
+    const integrationLogic = config.projectIntegration;
     if (integrationLogic) {
         (0, defaults_1.applyDefaults)(config, integrationLogic);
         app.get('/logo/integration/logo.png', (req, res) => res.sendFile(integrationLogic.imagePath || config.imagePath || (0, path_1.join)(__dirname, 'logo.png')));

package/out/models/index.d.ts

@@ -38,10 +38,6 @@ export interface Config extends ImagePath {
      * folder where module will create sqlite db file to persist credentials (e.g. {@example __dirname})
      */
     dbFolder: string;
-    /**
-     * integration module logic
-     */
-    integration?: IntegrationLogic & ImagePath;
     /**
      * integration module logic
      */
@@ -54,10 +50,6 @@ export interface Config extends ImagePath {
      * custom MT module logic
      */
     customMT?: CustomMTLogic;
-    /**
-     * resources module
-     */
-    resources?: UiModule & ImagePath;
     /**
      * resources module
      */
@@ -66,10 +58,6 @@ export interface Config extends ImagePath {
      * organization-menu module
      */
     organizationMenu?: UiModule & ImagePath;
-    /**
-     * editor-panels module
-     */
-    editorPanels?: EditorPanels;
     /**
      * editor-right-panel module
      */
@@ -78,18 +66,10 @@ export interface Config extends ImagePath {
      * project menu module
      */
     projectMenu?: UiModule;
-    /**
-     * tools module
-     */
-    tools?: UiModule & ImagePath;
     /**
      * tools module
      */
     projectTools?: UiModule & ImagePath;
-    /**
-     * reports module
-     */
-    reports?: UiModule & ImagePath;
     /**
      * reports module
      */

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"));
@@ -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) {
@@ -178,8 +188,8 @@ function checkSubscription(config, token, organization, accountType) {
             else {
                 console.error(e);
             }
-            (0, _1.log)('Recieved http error from subscription request. Returning expired=true', config.logger);
-            return { expired: true };
+            (0, _1.log)('Recieved http error from subscription request. Returning expired=false', config.logger);
+            return { expired: false };
         }
     });
 }

package/package.json

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