@crowdin/app-project-module 0.51.2 → 0.51.3

package/out/middlewares/crowdin-client.js

@@ -60,6 +60,7 @@ function handle(config, optional = false, checkSubscriptionExpiration = true) {
         var _a;
         const jwtToken = getToken(req);
         if (!jwtToken) {
+            (0, logger_1.temporaryErrorDebug)('Access denied: crowdin-client', req);
             return res.status(403).send({ error: 'Access denied' });
         }
         try {

package/out/middlewares/integration-credentials.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../storage");
 const util_1 = require("../util");
 const connection_1 = require("../util/connection");
+const logger_1 = require("../util/logger");
 function handle(config, integration, optional = false) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         const clientId = req.crowdinContext.clientId;
@@ -22,6 +23,7 @@ function handle(config, integration, optional = false) {
             if (optional) {
                 return next();
             }
+            (0, logger_1.temporaryErrorDebug)('Access denied: integration-credentials', req);
             return res.status(403).send({ error: 'Access denied' });
         }
         if (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config) {

package/out/middlewares/ui-module.js

@@ -26,6 +26,7 @@ function handle(config, allowUnauthorized = false) {
         }
         const jwtToken = req.query.jwtToken;
         if (!jwtToken) {
+            (0, logger_1.temporaryErrorDebug)('Access denied: ui-module', req);
             return res.status(403).send({ error: 'Access denied' });
         }
         (0, logger_1.log)('Validating jwt token from incoming request');

package/out/modules/integration/handlers/crowdin-webhook.js

@@ -78,6 +78,7 @@ function handle(config, integration) {
                 provider: types_1.Provider.CROWDIN,
             });
             if (!crowdinClient) {
+                (0, logger_1.temporaryErrorDebug)('Access denied: crowdin-webhooks', req);
                 return res.status(403).send({ error: 'Access denied' });
             }
             if (!syncSettings) {

package/out/modules/integration/handlers/integration-webhook.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../../util");
 const webhooks_1 = require("../util/webhooks");
 const types_1 = require("../types");
+const logger_1 = require("../../../util/logger");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -25,6 +26,7 @@ function handle(config, integration) {
                 provider: types_1.Provider.INTEGRATION,
             });
             if (!webhookData.crowdinClient) {
+                (0, logger_1.temporaryErrorDebug)('Access denied: integration-webhooks !webhookData.crowdinClient', req);
                 return res.status(403).send({ error: 'Access denied' });
             }
             if (!webhookData.syncSettings) {
@@ -34,6 +36,7 @@ function handle(config, integration) {
             res.send({});
         }
         else {
+            (0, logger_1.temporaryErrorDebug)('Access denied: integration-webhooks !webhookUrlParam', req);
             return res.status(403).send({ error: 'Access denied' });
         }
     }));

package/out/modules/integration/handlers/sync-settings-save.js

@@ -18,6 +18,10 @@ const cron_1 = require("../util/cron");
 const snapshot_1 = require("../util/snapshot");
 const files_1 = require("../util/files");
 const job_1 = require("../util/job");
+function checkAutoSyncSettings(integration, appSettings, provider) {
+    var _a;
+    return !!(!integration.webhooks && ((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]);
+}
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const { files, provider, expandIntegrationFolders } = req.body;
@@ -29,7 +33,6 @@ function handle(config, integration) {
             payload: req.body,
             res,
             jobCallback: () => __awaiter(this, void 0, void 0, function* () {
-                var _a;
                 if (Array.isArray(expandIntegrationFolders) && expandIntegrationFolders.length) {
                     const allFiles = (yield (0, files_1.expandFilesTree)(expandIntegrationFolders, req, integration)).map((node) => ({
                         id: node.id,
@@ -56,7 +59,7 @@ function handle(config, integration) {
                     });
                 }
                 const appSettings = req.integrationSettings || {};
-                if (((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]) {
+                if (checkAutoSyncSettings(integration, appSettings, provider)) {
                     yield (0, snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider);
                 }
             }),

package/out/util/logger.d.ts

@@ -1,5 +1,7 @@
 import { AxiosError } from 'axios';
-import { Config, CrowdinContextInfo, UnauthorizedConfig } from '../types';
+import { Config, CrowdinClientRequest, CrowdinContextInfo, UnauthorizedConfig } from '../types';
+import { IntegrationRequest } from '../modules/integration/types';
+import { Request } from 'express';
 export type LogFunction = (message: string) => void;
 export type LogErrorFunction = (error: any) => void;
 export type LogContext = {
@@ -34,4 +36,5 @@ export declare function handleUserError({ action, error, crowdinId, clientId, }:
     crowdinId: string;
     clientId?: string;
 }): Promise<void>;
+export declare function temporaryErrorDebug(msg: string, req: Request | IntegrationRequest | CrowdinClientRequest): void;
 export {};

package/out/util/logger.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUserError = exports.AppModuleAggregateError = exports.AppModuleError = exports.getErrorMessage = exports.isAxiosError = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.prepareContext = exports.initialize = void 0;
+exports.temporaryErrorDebug = exports.handleUserError = exports.AppModuleAggregateError = exports.AppModuleError = exports.getErrorMessage = exports.isAxiosError = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.prepareContext = exports.initialize = void 0;
 const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
 const storage_1 = require("../storage");
 let logConfig;
@@ -274,3 +274,8 @@ function handleUserError({ action, error, crowdinId, clientId, }) {
     });
 }
 exports.handleUserError = handleUserError;
+function temporaryErrorDebug(msg, req) {
+    // eslint-disable-next-line no-console
+    console.log(msg, req.headers, Object.assign({ originalUrl: req.originalUrl }, req.query));
+}
+exports.temporaryErrorDebug = temporaryErrorDebug;

package/out/views/main.handlebars

@@ -721,6 +721,8 @@
         const settingsModal = document.getElementById('settings-modal');
         const settingsSaveBtn = document.getElementById('settings-save-btn');
         let config = JSON.parse('{{{config}}}');
+        const newCrowdinFiles = config?.['new-crowdin-files'];
+        const newIntegrationFiles = config?.['new-integration-files'];
 
         function triggerEvent(el, type) {
             const e = document.createEvent('HTMLEvents');
@@ -932,7 +934,7 @@
             {{#if syncNewElements.integration}}
                 syncData = e.detail;
                 const isFolder = await hasFolder(e.detail);
-                if (isFolder) {
+                if (isFolder && !newIntegrationFiles) {
                     openScheduleModal('integration');
                     return;
                 }
@@ -960,7 +962,7 @@
             {{#if syncNewElements.crowdin}}
                 syncData = e.detail;
                 const isFolder = await hasFolder(e.detail);
-                if (isFolder) {
+                if (isFolder && !newCrowdinFiles) {
                     openScheduleModal('crowdin');
                     return;
                 }

package/package.json

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