@crowdin/app-project-module 0.28.7 → 0.28.8

package/out/middlewares/crowdin-client.js

@@ -46,12 +46,12 @@ function prepareCrowdinRequest(jwtToken, config, optional = false, checkSubscrip
 exports.prepareCrowdinRequest = prepareCrowdinRequest;
 function handle(config, optional = false, checkSubscriptionExpiration = true) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-        const tokenJwt = getToken(req);
-        if (!tokenJwt) {
+        const jwtToken = getToken(req);
+        if (!jwtToken) {
             return res.status(403).send({ error: 'Access denied' });
         }
         try {
-            const data = yield prepareCrowdinRequest(tokenJwt, config, optional, checkSubscriptionExpiration);
+            const data = yield prepareCrowdinRequest(jwtToken, config, optional, checkSubscriptionExpiration);
             req.crowdinContext = data.context;
             if (data.client) {
                 req.crowdinApiClient = data.client;
@@ -76,9 +76,9 @@ function handle(config, optional = false, checkSubscriptionExpiration = true) {
 }
 exports.default = handle;
 function getToken(req) {
-    const tokenJwt = (req.query.tokenJwt || req.query.jwtToken);
-    if (tokenJwt) {
-        return tokenJwt;
+    const jwtToken = req.query.jwtToken;
+    if (jwtToken) {
+        return jwtToken;
     }
     if (req.headers.authorization) {
         if (req.headers.authorization.startsWith('Bearer ') || req.headers.authorization.startsWith('bearer ')) {

package/out/middlewares/ui-module.js

@@ -19,12 +19,12 @@ function handle(config, allowUnauthorized = false) {
             next();
             return;
         }
-        const tokenJwt = req.query.tokenJwt;
-        if (!tokenJwt) {
+        const jwtToken = req.query.jwtToken;
+        if (!jwtToken) {
             return res.status(403).send({ error: 'Access denied' });
         }
         (0, util_1.log)('Validating jwt token from incoming request', config.logger);
-        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(tokenJwt, config.clientSecret, config.jwtValidationOptions);
+        const jwtPayload = yield (0, crowdin_apps_functions_1.validateJwtToken)(jwtToken, config.clientSecret, config.jwtValidationOptions);
         const id = `${jwtPayload.domain || jwtPayload.context.organization_id}`;
         (0, util_1.log)('Loading crowdin credentials', config.logger);
         const credentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(id);

package/out/static/js/main.js

@@ -1,143 +1,94 @@
 if (!window.Promise) {
-  window.Promise = Promise;
+    window.Promise = Promise;
 }
 
 const urlParams = new URLSearchParams(window.location.search);
 const origin = urlParams.get('origin');
 const clientId = urlParams.get('client_id');
-const tokenJwt = urlParams.get('tokenJwt');
 let restParams = window.location.search;
 const frameData = JSON.parse(window.name);
 
 const postPromises = {};
 
-function parentWindowPostMessage(data) {
-  return new Promise((resolve, reject) => {
-    window.parent.postMessage(JSON.stringify(data), origin);
-    const timerId = setTimeout(() => {
-      reject();
-    }, 10000);
-    postPromises[data.uid] = { resolve: resolve, timer: timerId };
-  });
-}
-
 window.addEventListener('message', handleMessage);
 
 function isJson(string) {
-  try {
-    JSON.parse(string);
-  } catch (e) {
-    return false;
-  }
+    try {
+        JSON.parse(string);
+    } catch (e) {
+        return false;
+    }
 
-  return true;
+    return true;
 }
 
 function handleMessage(event) {
-  const eventData =
-    event.data && typeof event.data === 'string' && isJson(event.data) ? JSON.parse(event.data) : {};
-  if (postPromises[eventData.uid]) {
-    if (postPromises[eventData.uid].timer) {
-      clearTimeout(postPromises[eventData.uid].timer);
+    const eventData = event.data && typeof event.data === 'string' && isJson(event.data) ? JSON.parse(event.data) : {};
+    if (postPromises[eventData.uid]) {
+        if (postPromises[eventData.uid].timer) {
+            clearTimeout(postPromises[eventData.uid].timer);
+        }
+        postPromises[eventData.uid].resolve(eventData.data);
     }
-    postPromises[eventData.uid].resolve(eventData.data);
-  }
 }
 
 function showToast(message) {
-  if (!!message) {
-    const toasts = document.querySelector('crowdin-toasts');
-    if (toasts && toasts.pushToasts) {
-      toasts.pushToasts([message]);
+    if (!!message) {
+        const toasts = document.querySelector('crowdin-toasts');
+        if (toasts && toasts.pushToasts) {
+            toasts.pushToasts([message]);
+        }
     }
-  }
 }
 
 function catchRejection(e, message) {
-  //session expired
-  if (e.code && e.code === 401) {
-    reloadLocation();
-    return;
-  }
-  //payment required
-  if (e.code && e.code === 402 && subscriptionModal) {
-    subscriptionLink = e.message || message;
-    subscriptionModal.open();
-    return;
-  }
-  showToast(e.message || message);
+    //session expired
+    if (e.code && e.code === 401) {
+        reloadLocation();
+        return;
+    }
+    //payment required
+    if (e.code && e.code === 402 && subscriptionModal) {
+        subscriptionLink = e.message || message;
+        subscriptionModal.open();
+        return;
+    }
+    showToast(e.message || message);
 }
 
 function checkResponse(response) {
-  return new Promise((resolve, reject) => {
-    if (response.status === 204) {
-      return resolve();
-    }
-    response
-      .json()
-      .then((res) => {
-        if (![200, 201, 304].includes(response.status)) {
-          reject(res);
-        } else {
-          if (res.message) {
-            showToast(res.message);
-          }
-          resolve(res);
+    return new Promise((resolve, reject) => {
+        if (response.status === 204) {
+            return resolve();
         }
-      })
-      .catch((e) => {
-        reject(e);
-      });
-  });
+        response
+            .json()
+            .then((res) => {
+                if (![200, 201, 304].includes(response.status)) {
+                    reject(res);
+                } else {
+                    if (res.message) {
+                        showToast(res.message);
+                    }
+                    resolve(res);
+                }
+            })
+            .catch((e) => {
+                reject(e);
+            });
+    });
 }
 
 function checkOrigin() {
-  return new Promise((resolve, reject) => {
-    try {
-      const tokenData = parseJwt(tokenJwt);
-      if (tokenData.exp < parseInt(new Date().getTime() / 1000)) {
-        // request for new token
-        parentWindowPostMessage({
-          identifier: frameData.app.identifier,
-          key: frameData.app.key,
-          client_id: clientId,
-          command: 'token',
-          uid: new Date().getTime(),
-          data: {},
-        })
-          .then((eventData) => {
-            restParams = `?origin=${origin}&client_id=${clientId}&tokenJwt=${eventData.tokenJwt}`;
+    return new Promise((resolve, reject) => {
+        AP.getJwtToken(jwtToken => {
+            restParams = `?origin=${origin}&client_id=${clientId}&jwtToken=${jwtToken}`;
             resolve(restParams);
-          })
-          .catch(() => reject());
-      } else {
-        resolve(restParams);
-      }
-    } catch (e) {
-      reject();
-    }
-  });
-}
-
-function parseJwt(token) {
-  const base64Url = token.split('.')[1];
-  const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-  const jsonPayload = decodeURIComponent(
-    atob(base64)
-      .split('')
-      .map(function (c) {
-        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-      })
-      .join(''),
-  );
-  return JSON.parse(jsonPayload);
+        });
+    });
 }
 
 function reloadLocation() {
-  window.location.href =
-    window.location.protocol +
-    '//' +
-    window.location.host +
-    window.location.pathname +
-    restParams;
+    window.location.href =
+        window.location.protocol + '//' + window.location.host + window.location.pathname + restParams;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.28.7",
+  "version": "0.28.8",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -26,7 +26,6 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/amqplib": "^0.10.1",
     "@babel/preset-react": "^7.18.6",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
@@ -42,6 +41,7 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.0",
+    "@types/amqplib": "^0.10.1",
     "@types/crypto-js": "^4.0.0",
     "@types/express": "4.17.17",
     "@types/express-handlebars": "^5.3.1",