@crowdin/app-project-module 0.60.0 → 0.60.2

package/out/modules/integration/handlers/oauth-login.js

@@ -61,6 +61,7 @@ function handle(config, integration) {
             }
             message.data = oauthCredentials;
             if (((_p = integration.oauthLogin) === null || _p === void 0 ? void 0 : _p.mode) === 'polling' && state) {
+                yield (0, storage_1.getStorage)().deleteMetadata(state);
                 yield (0, storage_1.getStorage)().saveMetadata(state, oauthCredentials);
             }
             return res.render('oauth', { message: JSON.stringify(message), oauthMode: (_q = integration.oauthLogin) === null || _q === void 0 ? void 0 : _q.mode });

package/out/modules/integration/handlers/oauth-url.js

@@ -9,6 +9,7 @@ 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 defaults_1 = require("../util/defaults");
 function handle(config, integration) {
@@ -21,6 +22,8 @@ function handle(config, integration) {
             return;
         }
         const { loginForm } = req.body;
+        yield (0, storage_1.getStorage)().deleteMetadata((0, defaults_1.getOAuthLoginFormId)(req.crowdinContext.clientId));
+        yield (0, storage_1.getStorage)().saveMetadata((0, defaults_1.getOAuthLoginFormId)(req.crowdinContext.clientId), loginForm);
         const url = (0, defaults_1.constructOauthUrl)({ config, integration, clientId: req.crowdinContext.clientId, loginForm });
         res.send({ url });
     }));

package/out/modules/integration/types.d.ts

@@ -170,7 +170,7 @@ export interface OAuthLogin {
     /**
      * Authorization url getter
      */
-    getAuthorizationUrl?: (redirectUrl: string, loginForm?: any) => string;
+    getAuthorizationUrl?: (redirectUrl: string, loginForm: any) => string;
     /**
      * Access token url (e.g. https://github.com/login/oauth/access_token)
      */
@@ -264,11 +264,11 @@ export interface OAuthLogin {
      */
     performGetTokenRequest?: (code: string, query: {
         [key: string]: any;
-    }, url: string) => Promise<any>;
+    }, url: string, loginForm?: any) => Promise<any>;
     /**
      * Override to implement request for refreshing token (only if 'refresh' is enabled)
      */
-    performRefreshTokenRequest?: (currentCredentials: any) => Promise<any>;
+    performRefreshTokenRequest?: (currentCredentials: any, loginForm?: any) => Promise<any>;
 }
 export interface File {
     id: string;

package/out/modules/integration/util/defaults.d.ts

@@ -11,3 +11,4 @@ export declare function constructOauthUrl({ config, integration, clientId, login
     loginForm?: any;
 }): string | undefined;
 export declare function getOAuthPollingId(clientId: string): string;
+export declare function getOAuthLoginFormId(clientId: string): string;

package/out/modules/integration/util/defaults.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOAuthPollingId = exports.constructOauthUrl = exports.applyIntegrationModuleDefaults = exports.getOauthRoute = exports.getRootFolder = void 0;
+exports.getOAuthLoginFormId = exports.getOAuthPollingId = exports.constructOauthUrl = exports.applyIntegrationModuleDefaults = exports.getOauthRoute = exports.getRootFolder = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
 function getRootFolder(config, integration, client, projectId) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -258,25 +258,32 @@ function applyIntegrationModuleDefaults(config, integration) {
 }
 exports.applyIntegrationModuleDefaults = applyIntegrationModuleDefaults;
 function constructOauthUrl({ config, integration, clientId, loginForm, }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const oauth = integration.oauthLogin;
     if (!oauth) {
         return;
     }
     if (oauth.getAuthorizationUrl) {
-        return oauth.getAuthorizationUrl(`${config.baseUrl}${getOauthRoute(integration)}`, loginForm);
+        if (!loginForm) {
+            return;
+        }
+        let url = oauth.getAuthorizationUrl(`${config.baseUrl}${getOauthRoute(integration)}`, loginForm);
+        if (oauth.mode === 'polling') {
+            url += `&${((_a = oauth.fieldsMapping) === null || _a === void 0 ? void 0 : _a.state) || 'state'}=${getOAuthPollingId(clientId)}`;
+        }
+        return url;
     }
     if (!oauth.authorizationUrl) {
         return;
     }
     let url = oauth.authorizationUrl || '';
-    url += `?${((_a = oauth.fieldsMapping) === null || _a === void 0 ? void 0 : _a.clientId) || 'client_id'}=${oauth.clientId}`;
-    url += `&${((_b = oauth.fieldsMapping) === null || _b === void 0 ? void 0 : _b.redirectUri) || 'redirect_uri'}=${config.baseUrl}${getOauthRoute(integration)}`;
+    url += `?${((_b = oauth.fieldsMapping) === null || _b === void 0 ? void 0 : _b.clientId) || 'client_id'}=${oauth.clientId}`;
+    url += `&${((_c = oauth.fieldsMapping) === null || _c === void 0 ? void 0 : _c.redirectUri) || 'redirect_uri'}=${config.baseUrl}${getOauthRoute(integration)}`;
     if (oauth.scope) {
-        url += `&${((_c = oauth.fieldsMapping) === null || _c === void 0 ? void 0 : _c.scope) || 'scope'}=${oauth.scope}`;
+        url += `&${((_d = oauth.fieldsMapping) === null || _d === void 0 ? void 0 : _d.scope) || 'scope'}=${oauth.scope}`;
     }
     if (oauth.mode === 'polling') {
-        url += `&${((_d = oauth.fieldsMapping) === null || _d === void 0 ? void 0 : _d.state) || 'state'}=${getOAuthPollingId(clientId)}`;
+        url += `&${((_e = oauth.fieldsMapping) === null || _e === void 0 ? void 0 : _e.state) || 'state'}=${getOAuthPollingId(clientId)}`;
     }
     if (oauth.extraAutorizationUrlParameters) {
         Object.entries(oauth.extraAutorizationUrlParameters).forEach(([key, value]) => (url += `&${key}=${value}`));
@@ -288,3 +295,7 @@ function getOAuthPollingId(clientId) {
     return `oauth_${clientId}`;
 }
 exports.getOAuthPollingId = getOAuthPollingId;
+function getOAuthLoginFormId(clientId) {
+    return `oauth_form_${clientId}`;
+}
+exports.getOAuthLoginFormId = getOAuthLoginFormId;

package/out/util/connection.js

@@ -45,6 +45,7 @@ const types_1 = require("../types");
 const axios_2 = require("./axios");
 const logger_1 = require("./logger");
 const os = __importStar(require("os"));
+const defaults_1 = require("../modules/integration/util/defaults");
 const axiosCustom = new axios_2.AxiosProvider().axios;
 function prepareCrowdinClient({ config, credentials, autoRenew = false, context, }) {
     var _a, _b;
@@ -231,7 +232,8 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
                 (0, logger_1.log)('Integration credentials have expired. Requesting a new credentials');
                 let newCredentials;
                 if (performRefreshTokenRequest) {
-                    newCredentials = yield performRefreshTokenRequest(credentials);
+                    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;

package/package.json

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