@crowdin/app-project-module 0.17.7 → 0.17.8

package/README.md

@@ -19,14 +19,6 @@ In both options you will need to provide Crowdin App configuration file. Please
 - `getUserSettings` to get settings that users manage in the integration module
 - `establishCrowdinConnection` method that accept jwt token that you may forward from module UI and it will return back Crowdin client instance and the context.
 
-## Status
-
-[![npm](https://img.shields.io/npm/v/@crowdin/app-project-module?logo=npm&cacheSeconds=1800)](https://www.npmjs.com/package/@crowdin/app-project-module)
-[![Build Status](https://dev.azure.com/crowdin/app-project-module/_apis/build/status/Basic?branchName=master)](https://dev.azure.com/crowdin/app-project-module/_build/latest?definitionId=39&branchName=master)
-[![npm](https://img.shields.io/npm/dt/@crowdin/app-project-module?cacheSeconds=1800)](https://www.npmjs.com/package/@crowdin/app-project-module)
-<!-- [![GitHub issues](https://img.shields.io/github/issues/crowdin/app-project-module?cacheSeconds=3600)](https://github.com/crowdin/app-project-module/issues)
-[![License](https://img.shields.io/github/license/crowdin/app-project-module?cacheSeconds=3600)](https://github.com/crowdin/app-project-module/blob/master/LICENSE) -->
-
 ## Table of Contents
 
 - [Installation](#installation)
@@ -81,7 +73,11 @@ const configuration = {
     description: 'Sample App description',
     dbFolder: __dirname,
     imagePath: __dirname + '/' + 'logo.png',
-    // crowdinBaseUrl: 'https://local.crowdin.dev/api/v2',
+    crowdinUrls: { // custom urls to override
+        // apiUrl: 'https://local.crowdin.dev/api/v2'
+        // accountUrl: 'https://local.crowdin.dev/oauth/token' // (default https://accounts.crowdin.com/oauth/token)
+        // subscriptionUrl: 'https://local.crowdin.dev' // (default https://crowdin.com or https://org.api.crowdin.com)
+    },
     projectIntegration: {
         withRootFolder: true,
         withCronSync: {

package/out/handlers/install.js

@@ -15,9 +15,10 @@ const storage_1 = require("../storage");
 const util_1 = require("../util");
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const event = req.body;
         (0, util_1.log)(`Recieved install request ${JSON.stringify(event, null, 2)}`, config.logger);
-        const token = yield (0, crowdin_apps_functions_1.generateOAuthToken)(config.clientId, config.clientSecret, event.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);
         const credentials = {
             id: (event.domain || event.organizationId).toString(),
             appSecret: event.appSecret,

package/out/models/index.d.ts

@@ -19,9 +19,9 @@ export interface Config extends ImagePath {
      */
     baseUrl: string;
     /**
-     * define Crowdin API url (e.g. to work against local Crowdin server)
+     * define custom Crowdin urls (e.g. to work against local Crowdin server)
      */
-    crowdinBaseUrl?: string;
+    crowdinUrls?: CrowdinUrls;
     /**
      * Set of scopes requested by this app (default 'project')
      */
@@ -99,6 +99,11 @@ export interface Config extends ImagePath {
      */
     pricing?: Pricing;
 }
+export interface CrowdinUrls {
+    apiUrl?: string;
+    accountUrl?: string;
+    subscriptionUrl?: string;
+}
 export declare enum Scope {
     ALL_SCOPES = "all",
     NOTIFICATIONS = "notification",

package/out/util/connection.js

@@ -39,18 +39,19 @@ const _1 = require(".");
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 function prepareCrowdinClient(config, credentials) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const isExpired = +credentials.expire < +new Date().getTime() / 1000;
         const organization = credentials.type === models_1.AccountType.ENTERPRISE ? credentials.id : undefined;
         if (!isExpired) {
             const token = (0, _1.decryptData)(config, credentials.accessToken);
             return {
-                client: new crowdin_api_client_1.default({ token, organization, baseUrl: config.crowdinBaseUrl }),
+                client: new crowdin_api_client_1.default({ token, organization, baseUrl: (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.apiUrl }),
                 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, credentials.refreshToken));
+        const newCredentials = yield crowdinAppFunctions.refreshOAuthToken(config.clientId, config.clientSecret, (0, _1.decryptData)(config, credentials.refreshToken), (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.accountUrl);
         (0, _1.log)('Saving updated crowdin credentials in the database', config.logger);
         yield (0, storage_1.updateCrowdinCredentials)({
             id: credentials.id,
@@ -65,7 +66,11 @@ function prepareCrowdinClient(config, credentials) {
             type: credentials.type,
         });
         return {
-            client: new crowdin_api_client_1.default({ token: newCredentials.accessToken, organization, baseUrl: config.crowdinBaseUrl }),
+            client: new crowdin_api_client_1.default({
+                token: newCredentials.accessToken,
+                organization,
+                baseUrl: (_c = config.crowdinUrls) === null || _c === void 0 ? void 0 : _c.apiUrl,
+            }),
             token: newCredentials.accessToken,
         };
     });
@@ -147,7 +152,7 @@ function validateSubscription(date) {
     return { expired, daysLeft };
 }
 function checkSubscription(config, token, organization, accountType) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         if (isAppFree(config)) {
             return { expired: false };
@@ -169,11 +174,12 @@ function checkSubscription(config, token, organization, accountType) {
                 appIdentifier,
                 organization: accountType === models_1.AccountType.ENTERPRISE ? organization : undefined,
                 token,
+                baseUrl: (_a = config.crowdinUrls) === null || _a === void 0 ? void 0 : _a.subscriptionUrl,
             });
             (0, _1.log)(`Recieved subscription info. ${JSON.stringify(subscription)}`, config.logger);
             const { expired, daysLeft } = validateSubscription(new Date(subscription.expires));
             (0, _1.log)(`expired ${expired}`, config.logger);
-            addToCache(organization, appIdentifier, new Date(subscription.expires), models_1.SubscriptionInfoType.SUBSCRIPTION, (_a = config.pricing) === null || _a === void 0 ? void 0 : _a.cachingSeconds);
+            addToCache(organization, appIdentifier, new Date(subscription.expires), models_1.SubscriptionInfoType.SUBSCRIPTION, (_b = config.pricing) === null || _b === void 0 ? void 0 : _b.cachingSeconds);
             return { expired, daysLeft, type: models_1.SubscriptionInfoType.SUBSCRIPTION };
         }
         catch (e) {
@@ -184,17 +190,17 @@ function checkSubscription(config, token, organization, accountType) {
                 const defaultSubscriptionPlan = 14;
                 let days;
                 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;
+                    days = ((_c = config.pricing) === null || _c === void 0 ? void 0 : _c.trialEnterprise) || ((_d = config.pricing) === null || _d === void 0 ? void 0 : _d.trial) || defaultSubscriptionPlan;
                 }
                 else {
-                    days = ((_d = config.pricing) === null || _d === void 0 ? void 0 : _d.trialCrowdin) || ((_e = config.pricing) === null || _e === void 0 ? void 0 : _e.trial) || defaultSubscriptionPlan;
+                    days = ((_e = config.pricing) === null || _e === void 0 ? void 0 : _e.trialCrowdin) || ((_f = config.pricing) === null || _f === void 0 ? void 0 : _f.trial) || defaultSubscriptionPlan;
                 }
                 (0, _1.log)(`Subscriptino trial plan ${days} days`, config.logger);
                 const date = new Date(initializedAt);
                 date.setDate(date.getDate() + days);
                 const { expired, daysLeft } = validateSubscription(date);
                 (0, _1.log)(`expired ${expired}`, config.logger);
-                addToCache(organization, appIdentifier, new Date(date), models_1.SubscriptionInfoType.TRIAL, (_f = config.pricing) === null || _f === void 0 ? void 0 : _f.cachingSeconds, subscribeLink);
+                addToCache(organization, appIdentifier, new Date(date), models_1.SubscriptionInfoType.TRIAL, (_g = config.pricing) === null || _g === void 0 ? void 0 : _g.cachingSeconds, subscribeLink);
                 return { expired, subscribeLink, daysLeft, type: models_1.SubscriptionInfoType.TRIAL };
             }
             if (config.onError) {

package/package.json

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