@crowdin/app-project-module 0.60.1 → 0.60.3

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

@@ -19,52 +19,51 @@ const logger_1 = require("../../../util/logger");
 const storage_1 = require("../../../storage");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const message = {
             uid: 'oauth_popup',
         };
         const code = req.query[((_b = (_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.fieldsMapping) === null || _b === void 0 ? void 0 : _b.code) || 'code'];
-        const state = ((_c = integration.oauthLogin) === null || _c === void 0 ? void 0 : _c.mode) === 'polling'
-            ? req.query[((_e = (_d = integration.oauthLogin) === null || _d === void 0 ? void 0 : _d.fieldsMapping) === null || _e === void 0 ? void 0 : _e.state) || 'state']
-            : undefined;
+        const state = req.query[((_d = (_c = integration.oauthLogin) === null || _c === void 0 ? void 0 : _c.fieldsMapping) === null || _d === void 0 ? void 0 : _d.state) || 'state'];
         (0, logger_1.log)(`Received request from OAuth login callback. Code ${code}`);
-        if (state) {
-            (0, logger_1.log)(`Received request from OAuth login callback. State ${state}`);
-        }
+        (0, logger_1.log)(`Received request from OAuth login callback. State ${state}`);
+        const clientId = Buffer.from(state, 'base64').toString();
+        const redirectUri = `${config.baseUrl}${(0, defaults_1.getOauthRoute)(integration)}`;
         try {
             const oauthLogin = integration.oauthLogin;
             let credentials;
             if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.performGetTokenRequest) {
                 (0, logger_1.log)('Performing custom get bearer token request');
-                credentials = yield oauthLogin.performGetTokenRequest(code, req.query, req.originalUrl);
+                const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(clientId));
+                credentials = yield oauthLogin.performGetTokenRequest(code, req.query, req.originalUrl, redirectUri, loginForm);
             }
             else {
                 const request = {};
                 const oauthLogin = integration.oauthLogin;
-                request[((_f = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _f === void 0 ? void 0 : _f.code) || 'code'] = code;
-                request[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
-                request[((_h = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _h === void 0 ? void 0 : _h.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
-                request[((_j = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _j === void 0 ? void 0 : _j.redirectUri) || 'redirect_uri'] = `${config.baseUrl}${(0, defaults_1.getOauthRoute)(integration)}`;
+                request[((_e = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _e === void 0 ? void 0 : _e.code) || 'code'] = code;
+                request[((_f = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _f === void 0 ? void 0 : _f.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
+                request[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
+                request[((_h = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _h === void 0 ? void 0 : _h.redirectUri) || 'redirect_uri'] = redirectUri;
                 if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraAccessTokenParameters) {
                     Object.entries(oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraAccessTokenParameters).forEach(([key, value]) => (request[key] = value));
                 }
-                credentials = (yield axios_1.default.post(((_k = integration.oauthLogin) === null || _k === void 0 ? void 0 : _k.accessTokenUrl) || '', request, {
+                credentials = (yield axios_1.default.post(((_j = integration.oauthLogin) === null || _j === void 0 ? void 0 : _j.accessTokenUrl) || '', request, {
                     headers: { Accept: 'application/json' },
                 })).data;
             }
             const oauthCredentials = { originalUrl: req.originalUrl };
-            oauthCredentials.accessToken = credentials[((_l = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _l === void 0 ? void 0 : _l.accessToken) || 'access_token'];
+            oauthCredentials.accessToken = credentials[((_k = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _k === void 0 ? void 0 : _k.accessToken) || 'access_token'];
             if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.refresh) {
-                oauthCredentials.refreshToken = credentials[((_m = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _m === void 0 ? void 0 : _m.refreshToken) || 'refresh_token'];
+                oauthCredentials.refreshToken = credentials[((_l = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _l === void 0 ? void 0 : _l.refreshToken) || 'refresh_token'];
                 oauthCredentials.expireIn =
-                    Number(credentials[((_o = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _o === void 0 ? void 0 : _o.expiresIn) || 'expires_in']) + Date.now() / 1000;
+                    Number(credentials[((_m = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _m === void 0 ? void 0 : _m.expiresIn) || 'expires_in']) + Date.now() / 1000;
             }
             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);
+            if (((_o = integration.oauthLogin) === null || _o === void 0 ? void 0 : _o.mode) === 'polling') {
+                yield (0, storage_1.getStorage)().deleteMetadata((0, defaults_1.getOAuthPollingId)(clientId));
+                yield (0, storage_1.getStorage)().saveMetadata((0, defaults_1.getOAuthPollingId)(clientId), oauthCredentials);
             }
-            return res.render('oauth', { message: JSON.stringify(message), oauthMode: (_q = integration.oauthLogin) === null || _q === void 0 ? void 0 : _q.mode });
+            return res.render('oauth', { message: JSON.stringify(message), oauthMode: (_p = integration.oauthLogin) === null || _p === void 0 ? void 0 : _p.mode });
         }
         catch (e) {
             (0, logger_1.logError)(e);

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

@@ -233,7 +233,7 @@ export interface OAuthLogin {
          */
         expiresIn?: string;
         /**
-         * default 'state', used for `polling' mode
+         * default 'state'
          */
         state?: string;
     };
@@ -264,11 +264,11 @@ export interface OAuthLogin {
      */
     performGetTokenRequest?: (code: string, query: {
         [key: string]: any;
-    }, url: string) => Promise<any>;
+    }, url: string, redirectUri: 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,27 +258,28 @@ 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 loginForm
-            ? oauth.getAuthorizationUrl(`${config.baseUrl}${getOauthRoute(integration)}`, loginForm)
-            : undefined;
+        if (!loginForm) {
+            return;
+        }
+        let url = oauth.getAuthorizationUrl(`${config.baseUrl}${getOauthRoute(integration)}`, loginForm);
+        url += `&${((_a = oauth.fieldsMapping) === null || _a === void 0 ? void 0 : _a.state) || 'state'}=${Buffer.from(clientId).toString('base64')}`;
+        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)}`;
+    url += `&${((_d = oauth.fieldsMapping) === null || _d === void 0 ? void 0 : _d.state) || 'state'}=${Buffer.from(clientId).toString('base64')}`;
     if (oauth.scope) {
-        url += `&${((_c = oauth.fieldsMapping) === null || _c === void 0 ? void 0 : _c.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.scope) || 'scope'}=${oauth.scope}`;
     }
     if (oauth.extraAutorizationUrlParameters) {
         Object.entries(oauth.extraAutorizationUrlParameters).forEach(([key, value]) => (url += `&${key}=${value}`));
@@ -290,3 +291,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.1",
+  "version": "0.60.3",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",