@crowdin/app-project-module 1.3.1 → 1.4.1

package/out/types.d.ts

@@ -524,6 +524,10 @@ export interface ImagePath {
      * path to app logo (e.g. {@example join(__dirname, 'logo.png')})
      */
     imagePath?: string;
+    /**
+     * URL to app logo that can be used instead of hosting it in the app (e.g. 'https://example.com/logo.png')
+     */
+    imageUrl?: string;
 }
 export interface Logger {
     enabled: boolean;

package/out/util/connection.js

@@ -270,7 +270,7 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
             const performRefreshTokenRequest = (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.performRefreshTokenRequest) || (integrationLogin === null || integrationLogin === void 0 ? void 0 : integrationLogin.performRefreshTokenRequest);
             credentials.tokenProvider = {
                 getToken: (...args_1) => __awaiter(this, [...args_1], void 0, function* (force = false) {
-                    var _a, _b, _c, _d, _e, _f, _g;
+                    var _a, _b, _c, _d;
                     const { expireIn } = credentials;
                     //2 min as an extra buffer
                     const isExpired = !expireIn || expireIn - 120 < Date.now() / 1000;
@@ -280,33 +280,68 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
                     (0, logger_1.log)(force
                         ? 'Force refreshing integration credentials'
                         : 'Integration credentials have expired during operation. Requesting a new credentials');
+                    const doRefresh = (currentCredentials) => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b, _c;
+                        if (performRefreshTokenRequest) {
+                            const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(integrationCredentials.id));
+                            return performRefreshTokenRequest({ credentials: currentCredentials, loginForm });
+                        }
+                        else if (oauthLogin) {
+                            const url = oauthLogin.refreshTokenUrl || oauthLogin.accessTokenUrl;
+                            const request = {};
+                            request[((_a = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _a === void 0 ? void 0 : _a.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
+                            request[((_b = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _b === void 0 ? void 0 : _b.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
+                            request[((_c = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _c === void 0 ? void 0 : _c.refreshToken) || 'refresh_token'] =
+                                currentCredentials.refreshToken;
+                            if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters) {
+                                Object.entries(oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters).forEach(([key, value]) => (request[key] = value));
+                            }
+                            return (yield axios_1.default.post(url || '', request, {
+                                headers: { Accept: 'application/json' },
+                            })).data;
+                        }
+                        return null;
+                    });
                     let newCredentials;
-                    if (performRefreshTokenRequest) {
-                        const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(integrationCredentials.id));
-                        newCredentials = yield performRefreshTokenRequest({ credentials, loginForm });
+                    try {
+                        newCredentials = yield doRefresh(credentials);
                     }
-                    else if (oauthLogin) {
-                        const url = oauthLogin.refreshTokenUrl || oauthLogin.accessTokenUrl;
-                        const request = {};
-                        request[((_a = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _a === void 0 ? void 0 : _a.clientId) || 'client_id'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientId;
-                        request[((_b = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _b === void 0 ? void 0 : _b.clientSecret) || 'client_secret'] = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.clientSecret;
-                        request[((_c = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _c === void 0 ? void 0 : _c.refreshToken) || 'refresh_token'] = credentials.refreshToken;
-                        if (oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters) {
-                            Object.entries(oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.extraRefreshTokenParameters).forEach(([key, value]) => (request[key] = value));
+                    catch (e) {
+                        // In-memory refresh token may be stale (rotated by another process/worker,
+                        // or the token itself expired). Try fetching fresh credentials from DB.
+                        (0, logger_1.log)('Token refresh failed. Attempting to fetch fresh credentials from the database');
+                        const freshStoredCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(integrationCredentials.id);
+                        if (freshStoredCredentials) {
+                            const freshCredentials = JSON.parse((0, _1.decryptData)(config, freshStoredCredentials.credentials));
+                            if (freshCredentials.refreshToken &&
+                                freshCredentials.refreshToken !== credentials.refreshToken) {
+                                (0, logger_1.log)('Found a newer refresh token in the database, retrying token refresh');
+                                try {
+                                    newCredentials = yield doRefresh(freshCredentials);
+                                    credentials.refreshToken = freshCredentials.refreshToken;
+                                }
+                                catch (retryError) {
+                                    (0, logger_1.logError)(retryError);
+                                    throw retryError;
+                                }
+                            }
+                            else {
+                                throw e;
+                            }
+                        }
+                        else {
+                            throw e;
                         }
-                        newCredentials = (yield axios_1.default.post(url || '', request, {
-                            headers: { Accept: 'application/json' },
-                        })).data;
                     }
-                    else {
+                    if (!newCredentials) {
                         return credentials.accessToken;
                     }
-                    credentials.accessToken = newCredentials[((_d = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _d === void 0 ? void 0 : _d.accessToken) || 'access_token'];
+                    credentials.accessToken = newCredentials[((_a = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _a === void 0 ? void 0 : _a.accessToken) || 'access_token'];
                     credentials.expireIn =
-                        Number(newCredentials[((_e = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _e === void 0 ? void 0 : _e.expiresIn) || 'expires_in']) + Date.now() / 1000;
-                    if (newCredentials[((_f = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _f === void 0 ? void 0 : _f.refreshToken) || 'refresh_token']) {
+                        Number(newCredentials[((_b = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _b === void 0 ? void 0 : _b.expiresIn) || 'expires_in']) + Date.now() / 1000;
+                    if (newCredentials[((_c = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _c === void 0 ? void 0 : _c.refreshToken) || 'refresh_token']) {
                         credentials.refreshToken =
-                            newCredentials[((_g = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _g === void 0 ? void 0 : _g.refreshToken) || 'refresh_token'];
+                            newCredentials[((_d = oauthLogin === null || oauthLogin === void 0 ? void 0 : oauthLogin.fieldsMapping) === null || _d === void 0 ? void 0 : _d.refreshToken) || 'refresh_token'];
                     }
                     (0, logger_1.log)('Saving updated integration credentials in the database');
                     yield (0, storage_1.getStorage)().updateIntegrationCredentials(integrationCredentials.id, (0, _1.encryptData)(config, JSON.stringify(credentials)));

package/out/util/index.d.ts

@@ -14,7 +14,7 @@ export declare function getLogoUrl(config: Config | UnauthorizedConfig, moduleCo
  * Logo middleware with backwards compatibility
  * Serves both /logo.png (backwards-compatible) and actual file name
  * @param config - App configuration (required for Cloudflare Workers Assets support)
- * @param moduleConfig - Module configuration with imagePath (optional, falls back to config.imagePath)
+ * @param moduleConfig - Module configuration with imagePath or imageUrl (optional, falls back to config.imagePath)
  * @returns Express middleware
  */
 export declare function serveLogo(config: Config | UnauthorizedConfig, moduleConfig?: ImagePath): (req: Request, res: Response, next: Function) => Promise<void>;

package/out/util/index.js

@@ -177,8 +177,30 @@ function executeWithRetry(func_1) {
     });
 }
 function getLogoUrl(config, moduleConfig, modulePath) {
+    if (moduleConfig) {
+        if (moduleConfig.imageUrl) {
+            if (modulePath) {
+                return `/logo${modulePath}/logo.png`;
+            }
+            return '/logo.png';
+        }
+        else if (moduleConfig.imagePath) {
+            const imagePath = moduleConfig.imagePath;
+            const fileName = basename(imagePath);
+            if (!modulePath) {
+                return `/${fileName}`;
+            }
+            return `/logo${modulePath}/${fileName}`;
+        }
+    }
+    if (config.imageUrl) {
+        if (modulePath) {
+            return `/logo${modulePath}/logo.png`;
+        }
+        return '/logo.png';
+    }
     // Extract file name from imagePath with fallback to config.imagePath
-    const imagePath = (moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.imagePath) || config.imagePath;
+    const imagePath = config.imagePath;
     const fileName = basename(imagePath);
     if (!modulePath) {
         return `/${fileName}`;
@@ -189,11 +211,42 @@ function getLogoUrl(config, moduleConfig, modulePath) {
  * Logo middleware with backwards compatibility
  * Serves both /logo.png (backwards-compatible) and actual file name
  * @param config - App configuration (required for Cloudflare Workers Assets support)
- * @param moduleConfig - Module configuration with imagePath (optional, falls back to config.imagePath)
+ * @param moduleConfig - Module configuration with imagePath or imageUrl (optional, falls back to config.imagePath)
  * @returns Express middleware
  */
 function serveLogo(config, moduleConfig) {
-    const imagePath = (moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.imagePath) || config.imagePath;
+    if (moduleConfig) {
+        if (moduleConfig.imageUrl) {
+            return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                if (req.path === '/logo.png') {
+                    res.redirect(moduleConfig.imageUrl);
+                    return;
+                }
+                next();
+            });
+        }
+        else if (moduleConfig.imagePath) {
+            const fileHandler = (0, static_files_1.serveFile)(config, moduleConfig.imagePath);
+            const fileName = basename(moduleConfig.imagePath);
+            return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                // Match exact paths: /logo.png (backwards-compatible) or /{actual-file-name}
+                if (req.path === '/logo.png' || req.path === `/${fileName}`) {
+                    return fileHandler(req, res, next);
+                }
+                next();
+            });
+        }
+    }
+    if (config.imageUrl) {
+        return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            if (req.path === '/logo.png') {
+                res.redirect(config.imageUrl);
+                return;
+            }
+            next();
+        });
+    }
+    const imagePath = config.imagePath;
     const fileName = basename(imagePath);
     const fileHandler = (0, static_files_1.serveFile)(config, imagePath);
     return (req, res, next) => __awaiter(this, void 0, void 0, function* () {

package/out/views/AboutPage.js

@@ -58,7 +58,8 @@ const AboutPage = ({ name, logo, manifest, storeLink, showDebugLink }) => (react
                         react_1.default.createElement("div", { className: "mb-3" },
                             react_1.default.createElement("label", { htmlFor: "manifest-url", className: "form-label" }, "Paste the following manifest URL when prompted during manual installation:"),
                             react_1.default.createElement("div", { className: "input-group" },
-                                react_1.default.createElement("input", { type: "text", className: "form-control", id: "manifest-url", value: manifest, readOnly: true }))),
+                                react_1.default.createElement("input", { type: "text", className: "form-control", id: "manifest-url", value: manifest, readOnly: true }),
+                                react_1.default.createElement("button", { className: "btn btn-outline-secondary", type: "button", id: "copy-button" }, "Copy"))),
                         storeLink && (react_1.default.createElement("div", null,
                             "Read more about",
                             ' ',
@@ -72,5 +73,16 @@ const AboutPage = ({ name, logo, manifest, storeLink, showDebugLink }) => (react
                                 ' ',
                                 react_1.default.createElement("a", { href: "/__debug", target: "_blank", title: "Open developer console in a new tab" }, "Developer Console"),
                                 ' ',
-                                "to inspect requests, debug issues, and monitor application behavior."))))))))));
+                                "to inspect requests, debug issues, and monitor application behavior."))))))),
+        react_1.default.createElement("script", { dangerouslySetInnerHTML: {
+                __html: `
+                        document.getElementById('copy-button').addEventListener('click', async function() {
+                            var text = document.getElementById('manifest-url').value;
+                            await navigator.clipboard.writeText(text);
+                            var btn = document.getElementById('copy-button');
+                            btn.textContent = 'Copied!';
+                            setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
+                        });
+                    `.trim(),
+            } }))));
 exports.AboutPage = AboutPage;

package/package.json

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