@hyper.software/common-helpers 1.0.16 → 1.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/errors/CriticalError.js +6 -3
- package/lib/errors/CriticalError.js.map +1 -1
- package/lib/errors/ValidationError.js +6 -3
- package/lib/errors/ValidationError.js.map +1 -1
- package/lib/errors/ValidationErrorSilent.js +8 -5
- package/lib/errors/ValidationErrorSilent.js.map +1 -1
- package/lib/errors/ValidationErrorWithStatus.js +6 -3
- package/lib/errors/ValidationErrorWithStatus.js.map +1 -1
- package/lib/errors/ValidationErrorWithStatusSilent.js +8 -5
- package/lib/errors/ValidationErrorWithStatusSilent.js.map +1 -1
- package/lib/errors/__mocks__/errors.mock.js +7 -4
- package/lib/errors/__mocks__/errors.mock.js.map +1 -1
- package/lib/errors/__tests__/errorMappers.test.js +4 -2
- package/lib/errors/__tests__/errorMappers.test.js.map +1 -1
- package/lib/errors/__tests__/errors.test.js +20 -18
- package/lib/errors/__tests__/errors.test.js.map +1 -1
- package/lib/errors/errorMappers.js +36 -21
- package/lib/errors/errorMappers.js.map +1 -1
- package/lib/errors/errors.types.js +5 -2
- package/lib/errors/errors.types.js.map +1 -1
- package/lib/errors/index.js +13 -5
- package/lib/errors/index.js.map +1 -1
- package/lib/express/__tests__/swaggerHelpers.test.js +4 -2
- package/lib/express/__tests__/swaggerHelpers.test.js.map +1 -1
- package/lib/express/middleware/aliveMiddleware/index.js +5 -1
- package/lib/express/middleware/aliveMiddleware/index.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/company.js +15 -8
- package/lib/express/middleware/companyMiddleware/company.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/companyApiRequest.js +10 -3
- package/lib/express/middleware/companyMiddleware/companyApiRequest.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/index.js +8 -4
- package/lib/express/middleware/companyMiddleware/index.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/index.types.js +2 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js +40 -15
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js.map +1 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js +46 -15
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js.map +1 -1
- package/lib/express/middleware/index.js +18 -7
- package/lib/express/middleware/index.js.map +1 -1
- package/lib/express/middleware/languageMiddleware/index.js +35 -8
- package/lib/express/middleware/languageMiddleware/index.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/index.js +8 -4
- package/lib/express/middleware/partnerMiddleware/index.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/index.types.js +2 -1
- package/lib/express/middleware/partnerMiddleware/partner.js +15 -8
- package/lib/express/middleware/partnerMiddleware/partner.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/partnerServiceRequest.js +10 -3
- package/lib/express/middleware/partnerMiddleware/partnerServiceRequest.js.map +1 -1
- package/lib/express/middleware/responseHelpersMiddleware/index.js +7 -3
- package/lib/express/middleware/responseHelpersMiddleware/index.js.map +1 -1
- package/lib/express/middleware/responseHelpersMiddleware/types.js +2 -1
- package/lib/express/middleware/translationsMiddleware/index.js +7 -3
- package/lib/express/middleware/translationsMiddleware/index.js.map +1 -1
- package/lib/express/swaggerControllersConfig.js +7 -3
- package/lib/express/swaggerControllersConfig.js.map +1 -1
- package/lib/express/swaggerHelpers.js +5 -1
- package/lib/express/swaggerHelpers.js.map +1 -1
- package/lib/express/swaggerUiController.js +10 -5
- package/lib/express/swaggerUiController.js.map +1 -1
- package/lib/express/swaggerUiTemplate.js +7 -2
- package/lib/express/swaggerUiTemplate.js.map +1 -1
- package/lib/helpers/ExecuteOnce.js +4 -1
- package/lib/helpers/ExecuteOnce.js.map +1 -1
- package/lib/helpers/UniversalConfig.js +28 -2
- package/lib/helpers/UniversalConfig.js.map +1 -1
- package/lib/helpers/__tests__/arrays.test.js +26 -1
- package/lib/helpers/__tests__/arrays.test.js.map +1 -1
- package/lib/helpers/__tests__/emptyValues.test.js +5 -3
- package/lib/helpers/__tests__/emptyValues.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatCurrency.test.js +9 -7
- package/lib/helpers/__tests__/formatters.formatCurrency.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatDate.test.js +37 -35
- package/lib/helpers/__tests__/formatters.formatDate.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatDouble.test.js +4 -2
- package/lib/helpers/__tests__/formatters.formatDouble.test.js.map +1 -1
- package/lib/helpers/__tests__/navigation.test.js +12 -10
- package/lib/helpers/__tests__/navigation.test.js.map +1 -1
- package/lib/helpers/__tests__/strings.test.js +5 -3
- package/lib/helpers/__tests__/strings.test.js.map +1 -1
- package/lib/helpers/__tests__/validation.test.js +140 -115
- package/lib/helpers/__tests__/validation.test.js.map +1 -1
- package/lib/helpers/arrays.js +5 -1
- package/lib/helpers/arrays.js.map +1 -1
- package/lib/helpers/clientLogger.js +48 -15
- package/lib/helpers/clientLogger.js.map +1 -1
- package/lib/helpers/constants/common.js +34 -29
- package/lib/helpers/constants/common.js.map +1 -1
- package/lib/helpers/constants/fileUploads.js +4 -1
- package/lib/helpers/constants/fileUploads.js.map +1 -1
- package/lib/helpers/constants/index.js +31 -13
- package/lib/helpers/constants/index.js.map +1 -1
- package/lib/helpers/constants/integrations.js +15 -12
- package/lib/helpers/constants/integrations.js.map +1 -1
- package/lib/helpers/constants/language.js +6 -3
- package/lib/helpers/constants/language.js.map +1 -1
- package/lib/helpers/constants/swagger.js +7 -4
- package/lib/helpers/constants/swagger.js.map +1 -1
- package/lib/helpers/constants/urls.js +4 -1
- package/lib/helpers/constants/urls.js.map +1 -1
- package/lib/helpers/constants/user.js +7 -4
- package/lib/helpers/constants/user.js.map +1 -1
- package/lib/helpers/constants/validators.js +6 -3
- package/lib/helpers/constants/validators.js.map +1 -1
- package/lib/helpers/emptyValues.js +33 -5
- package/lib/helpers/emptyValues.js.map +1 -1
- package/lib/helpers/formatters.js +41 -10
- package/lib/helpers/formatters.js.map +1 -1
- package/lib/helpers/guards.js +9 -5
- package/lib/helpers/guards.js.map +1 -1
- package/lib/helpers/index.js +24 -6
- package/lib/helpers/index.js.map +1 -1
- package/lib/helpers/isBrowser.js +5 -1
- package/lib/helpers/isBrowser.js.map +1 -1
- package/lib/helpers/math.js +18 -13
- package/lib/helpers/math.js.map +1 -1
- package/lib/helpers/moment.js +28 -20
- package/lib/helpers/moment.js.map +1 -1
- package/lib/helpers/navigation.js +41 -9
- package/lib/helpers/navigation.js.map +1 -1
- package/lib/helpers/stringifySafe.js +5 -1
- package/lib/helpers/stringifySafe.js.map +1 -1
- package/lib/helpers/strings.js +13 -6
- package/lib/helpers/strings.js.map +1 -1
- package/lib/helpers/validation.js +98 -44
- package/lib/helpers/validation.js.map +1 -1
- package/lib/index.js +19 -3
- package/lib/index.js.map +1 -1
- package/lib/interfaces.js +8 -5
- package/lib/interfaces.js.map +1 -1
- package/lib/redux/analyticsMiddleware.js +30 -3
- package/lib/redux/analyticsMiddleware.js.map +1 -1
- package/lib/redux/clientMiddleware.js +29 -2
- package/lib/redux/clientMiddleware.js.map +1 -1
- package/lib/redux/emptyMiddleware.js +5 -1
- package/lib/redux/emptyMiddleware.js.map +1 -1
- package/lib/redux/index.js +9 -3
- package/lib/redux/index.js.map +1 -1
- package/lib/services/cookieService/cookieService.js +33 -4
- package/lib/services/cookieService/cookieService.js.map +1 -1
- package/lib/services/googleAnalyticsService/googleAnalyticsService.js +20 -10
- package/lib/services/googleAnalyticsService/googleAnalyticsService.js.map +1 -1
- package/lib/services/imageService/imageService.js +34 -6
- package/lib/services/imageService/imageService.js.map +1 -1
- package/lib/services/index.js +36 -10
- package/lib/services/index.js.map +1 -1
- package/lib/services/languageService/languageService.js +42 -13
- package/lib/services/languageService/languageService.js.map +1 -1
- package/lib/services/localstorageService/localstorageService.js +7 -2
- package/lib/services/localstorageService/localstorageService.js.map +1 -1
- package/lib/services/sessionStorageService/index.js +7 -2
- package/lib/services/sessionStorageService/index.js.map +1 -1
- package/lib/translations/getAllTranslations.js +34 -7
- package/lib/translations/getAllTranslations.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.aliveMiddleware = void 0;
|
|
4
|
+
function aliveMiddleware(_a) {
|
|
2
5
|
var _b = _a === void 0 ? {} : _a, _c = _b.metadata, metadata = _c === void 0 ? {} : _c;
|
|
3
6
|
var name = metadata.name, version = metadata.version, engines = metadata.engines, description = metadata.description;
|
|
4
7
|
var startedAt = new Date();
|
|
@@ -16,4 +19,5 @@ export function aliveMiddleware(_a) {
|
|
|
16
19
|
});
|
|
17
20
|
};
|
|
18
21
|
}
|
|
22
|
+
exports.aliveMiddleware = aliveMiddleware;
|
|
19
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/aliveMiddleware/index.ts"],"names":[],"mappings":"AASA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/aliveMiddleware/index.ts"],"names":[],"mappings":";;;AASA,SAAgB,eAAe,CAAC,EAAoC;QAApC,qBAAkC,EAAE,KAAA,EAAlC,gBAAa,EAAb,QAAQ,mBAAG,EAAE,KAAA;IACrC,IAAA,IAAI,GAAoC,QAAQ,KAA5C,EAAE,OAAO,GAA2B,QAAQ,QAAnC,EAAE,OAAO,GAAkB,QAAQ,QAA1B,EAAE,WAAW,GAAK,QAAQ,YAAb,CAAa;IACxD,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;IAE5B,OAAO,UAAC,GAAG,EAAE,GAAG;QACd,2BAA2B;QAC3B,OAAO,CAAC,GAAG,CAAC,UAAG,GAAG,CAAC,MAAM,iBAAO,GAAG,CAAC,WAAW,CAAE,CAAC,CAAA;QAClD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,MAAA;YACJ,OAAO,SAAA;YACP,WAAW,aAAA;YACX,KAAK,EAAE,IAAI;YACX,OAAO,SAAA;YACP,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,SAAS,WAAA;SACV,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAjBD,0CAiBC"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getCompany = exports.CHECK_CACHE_PERIOD = exports.DEFAULT_TTL = void 0;
|
|
7
|
+
var node_cache_1 = __importDefault(require("node-cache"));
|
|
8
|
+
var companyApiRequest_1 = require("./companyApiRequest");
|
|
9
|
+
exports.DEFAULT_TTL = 5 * 60; // in seconds
|
|
10
|
+
exports.CHECK_CACHE_PERIOD = 1 * 60; // in seconds
|
|
11
|
+
var companyCache = new node_cache_1.default({ stdTTL: exports.DEFAULT_TTL, checkperiod: exports.CHECK_CACHE_PERIOD });
|
|
12
|
+
function getCompany(_a) {
|
|
13
|
+
var subdomain = _a.subdomain, getCompanyUrl = _a.getCompanyUrl, getCompanyFunction = _a.getCompanyFunction, _b = _a.cacheTtl, cacheTtl = _b === void 0 ? exports.DEFAULT_TTL : _b;
|
|
8
14
|
var cacheKey = "company_".concat(subdomain);
|
|
9
15
|
var cachedCompany = companyCache.get(cacheKey);
|
|
10
16
|
if (!subdomain) {
|
|
@@ -13,9 +19,10 @@ export function getCompany(_a) {
|
|
|
13
19
|
if (cachedCompany) {
|
|
14
20
|
return Promise.resolve(cachedCompany);
|
|
15
21
|
}
|
|
16
|
-
return getCompanyFromApi({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction }).then(function (company) {
|
|
22
|
+
return (0, companyApiRequest_1.getCompanyFromApi)({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction }).then(function (company) {
|
|
17
23
|
companyCache.set(cacheKey, company, cacheTtl);
|
|
18
24
|
return company;
|
|
19
25
|
});
|
|
20
26
|
}
|
|
27
|
+
exports.getCompany = getCompany;
|
|
21
28
|
//# sourceMappingURL=company.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"company.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/company.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"company.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/company.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAClC,yDAAuD;AAG1C,QAAA,WAAW,GAAG,CAAC,GAAG,EAAE,CAAA,CAAC,aAAa;AAClC,QAAA,kBAAkB,GAAG,CAAC,GAAG,EAAE,CAAA,CAAC,aAAa;AACtD,IAAM,YAAY,GAAG,IAAI,oBAAS,CAAC,EAAE,MAAM,EAAE,mBAAW,EAAE,WAAW,EAAE,0BAAkB,EAAE,CAAC,CAAA;AAQ5F,SAAgB,UAAU,CAAC,EAA4F;QAA1F,SAAS,eAAA,EAAE,aAAa,mBAAA,EAAE,kBAAkB,wBAAA,EAAE,gBAAsB,EAAtB,QAAQ,mBAAG,mBAAW,KAAA;IAC/F,IAAM,QAAQ,GAAG,kBAAW,SAAS,CAAE,CAAA;IACvC,IAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAEhD,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;KAC7B;IAED,IAAI,aAAa,EAAE;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;KACtC;IAED,OAAO,IAAA,qCAAiB,EAAC,EAAE,SAAS,WAAA,EAAE,aAAa,eAAA,EAAE,kBAAkB,oBAAA,EAAE,CAAC,CAAC,IAAI,CAAC,UAAC,OAAO;QACtF,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC7C,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC;AAhBD,gCAgBC"}
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getCompanyFromApi = void 0;
|
|
7
|
+
var axios_1 = __importDefault(require("axios"));
|
|
8
|
+
function getCompanyFromApi(_a) {
|
|
3
9
|
var subdomain = _a.subdomain, getCompanyUrl = _a.getCompanyUrl, getCompanyFunction = _a.getCompanyFunction;
|
|
4
10
|
if (!subdomain) {
|
|
5
11
|
return Promise.resolve(null);
|
|
6
12
|
}
|
|
7
13
|
if (getCompanyUrl) {
|
|
8
|
-
return
|
|
14
|
+
return axios_1.default.get(getCompanyUrl(subdomain)).then(function (response) { return response.data; });
|
|
9
15
|
}
|
|
10
16
|
if (getCompanyFunction) {
|
|
11
17
|
return getCompanyFunction(subdomain);
|
|
12
18
|
}
|
|
13
19
|
return Promise.resolve(null);
|
|
14
20
|
}
|
|
21
|
+
exports.getCompanyFromApi = getCompanyFromApi;
|
|
15
22
|
//# sourceMappingURL=companyApiRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"companyApiRequest.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/companyApiRequest.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"companyApiRequest.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/companyApiRequest.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAyB;AAQzB,SAAgB,iBAAiB,CAAC,EAIN;QAH1B,SAAS,eAAA,EACT,aAAa,mBAAA,EACb,kBAAkB,wBAAA;IAElB,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;KAC7B;IAED,IAAI,aAAa,EAAE;QACjB,OAAO,eAAK,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ,IAAK,OAAA,QAAQ,CAAC,IAAI,EAAb,CAAa,CAAC,CAAA;KAC7E;IAED,IAAI,kBAAkB,EAAE;QACtB,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAA;KACrC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC;AAlBD,8CAkBC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.companyMiddleware = void 0;
|
|
4
|
+
var company_1 = require("./company");
|
|
5
|
+
var companyMiddleware = function (_a) {
|
|
3
6
|
var _b = _a === void 0 ? {} : _a, _c = _b.getCompanyFunction, getCompanyFunction = _c === void 0 ? null : _c, // (subdomain) => Promise.resolve(),
|
|
4
7
|
_d = _b.getCompanyUrl, // (subdomain) => Promise.resolve(),
|
|
5
8
|
getCompanyUrl = _d === void 0 ? null : _d, // (subdomain) => '',
|
|
6
9
|
_e = _b.cacheTtl, // (subdomain) => '',
|
|
7
|
-
cacheTtl = _e === void 0 ? DEFAULT_TTL : _e, // seconds
|
|
10
|
+
cacheTtl = _e === void 0 ? company_1.DEFAULT_TTL : _e, // seconds
|
|
8
11
|
_f = _b.options, // seconds
|
|
9
12
|
_g = _f === void 0 ? {} : _f, _h = _g.subdomainExtraParts, subdomainExtraParts = _h === void 0 ? [] : _h;
|
|
10
13
|
return function (req, _res, next) {
|
|
11
14
|
req.currentCompany = null; // eslint-disable-line no-param-reassign
|
|
12
15
|
var subdomain = getCompanySubdomainName(req, subdomainExtraParts);
|
|
13
|
-
getCompany({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction, cacheTtl: cacheTtl })
|
|
16
|
+
(0, company_1.getCompany)({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction, cacheTtl: cacheTtl })
|
|
14
17
|
.then(function (company) {
|
|
15
18
|
req.currentCompany = company; // eslint-disable-line no-param-reassign
|
|
16
19
|
return next();
|
|
@@ -21,6 +24,7 @@ export var companyMiddleware = function (_a) {
|
|
|
21
24
|
});
|
|
22
25
|
};
|
|
23
26
|
};
|
|
27
|
+
exports.companyMiddleware = companyMiddleware;
|
|
24
28
|
function getCompanySubdomainName(req, subdomainExtraParts) {
|
|
25
29
|
return req.subdomains.filter(function (part) { return !subdomainExtraParts.includes(part); }).join('');
|
|
26
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/index.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAW5C,IAAM,iBAAiB,GAC5B,UAAC,EAKK;QALL,qBAKG,EAAE,KAAA,EAJJ,0BAAyB,EAAzB,kBAAkB,mBAAG,IAAI,KAAA,EAAE,oCAAoC;IAC/D,qBAAoB,EADO,oCAAoC;IAC/D,aAAa,mBAAG,IAAI,KAAA,EAAE,qBAAqB;IAC3C,gBAAsB,EADA,qBAAqB;IAC3C,QAAQ,mBAAG,qBAAW,KAAA,EAAE,UAAU;IAClC,eAA0C,EADlB,UAAU;IAClC,qBAAwC,EAAE,KAAA,EAA/B,2BAAwB,EAAxB,mBAAmB,mBAAG,EAAE,KAAA;IAErC,OAAA,UAAC,GAAG,EAAE,IAAI,EAAE,IAAI;QACd,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA,CAAC,wCAAwC;QAElE,IAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;QACnE,IAAA,oBAAU,EAAC,EAAE,SAAS,WAAA,EAAE,aAAa,eAAA,EAAE,kBAAkB,oBAAA,EAAE,QAAQ,UAAA,EAAE,CAAC;aACnE,IAAI,CAAC,UAAC,OAAO;YACZ,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA,CAAC,wCAAwC;YACrE,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC;aACD,KAAK,CAAC;YACL,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA,CAAC,wCAAwC;YAClE,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;AAbD,CAaC,CAAA;AApBU,QAAA,iBAAiB,qBAoB3B;AAEH,SAAS,uBAAuB,CAAC,GAAG,EAAE,mBAAmB;IACvD,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAnC,CAAmC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACtF,CAAC"}
|
|
@@ -1,6 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
var errors_1 = require("../../../../errors");
|
|
27
|
+
var __1 = require("../");
|
|
28
|
+
var httpMock = __importStar(require("node-mocks-http"));
|
|
4
29
|
var logger = {
|
|
5
30
|
info: jest.fn(),
|
|
6
31
|
warn: jest.fn(),
|
|
@@ -19,8 +44,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
19
44
|
});
|
|
20
45
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationError Error', function () {
|
|
21
46
|
beforeEach(function () {
|
|
22
|
-
var validErr = new ValidationError('General Validation Error Message', 'api.test.message.general', {});
|
|
23
|
-
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
47
|
+
var validErr = new errors_1.ValidationError('General Validation Error Message', 'api.test.message.general', {});
|
|
48
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
24
49
|
});
|
|
25
50
|
it('SHOULD return the default 400 status', function () {
|
|
26
51
|
expect(res.status.mock.calls[0][0]).toBe(400);
|
|
@@ -29,8 +54,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
29
54
|
});
|
|
30
55
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatus Error', function () {
|
|
31
56
|
beforeEach(function () {
|
|
32
|
-
var validErr = new ValidationErrorWithStatus(123, 'Custom Error Message', 'api.test.message', {});
|
|
33
|
-
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
57
|
+
var validErr = new errors_1.ValidationErrorWithStatus(123, 'Custom Error Message', 'api.test.message', {});
|
|
58
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
34
59
|
});
|
|
35
60
|
it('SHOULD return the status sent to ValidationErrorWithStatus', function () {
|
|
36
61
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -39,8 +64,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
39
64
|
});
|
|
40
65
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatusSilent Error', function () {
|
|
41
66
|
beforeEach(function () {
|
|
42
|
-
var validErr = new ValidationErrorWithStatusSilent(123, 'Custom Error Message', 'api.test.message', {});
|
|
43
|
-
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
67
|
+
var validErr = new errors_1.ValidationErrorWithStatusSilent(123, 'Custom Error Message', 'api.test.message', {});
|
|
68
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
44
69
|
});
|
|
45
70
|
it('SHOULD return the status sent to ValidationErrorWithStatusSilent', function () {
|
|
46
71
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -51,8 +76,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
51
76
|
});
|
|
52
77
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorSilent Error', function () {
|
|
53
78
|
beforeEach(function () {
|
|
54
|
-
var validErr = new ValidationErrorSilent('Custom Error Message', 'custom.error.locale', {});
|
|
55
|
-
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
79
|
+
var validErr = new errors_1.ValidationErrorSilent('Custom Error Message', 'custom.error.locale', {});
|
|
80
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
56
81
|
});
|
|
57
82
|
it('SHOULD call logger.info and not logger.warn', function () {
|
|
58
83
|
expect(logger.info).toBeCalled();
|
|
@@ -64,7 +89,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
64
89
|
beforeEach(function () {
|
|
65
90
|
var err = new Error();
|
|
66
91
|
err.name = 'Sequelize Error';
|
|
67
|
-
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
92
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
68
93
|
});
|
|
69
94
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
70
95
|
});
|
|
@@ -72,7 +97,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
72
97
|
beforeEach(function () {
|
|
73
98
|
var err = new Error();
|
|
74
99
|
err.isJoi = true;
|
|
75
|
-
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
100
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
76
101
|
});
|
|
77
102
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
78
103
|
});
|
|
@@ -80,14 +105,14 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
80
105
|
beforeEach(function () {
|
|
81
106
|
var err = new Error();
|
|
82
107
|
err.code = 'SCHEMA_VALIDATION_FAILED';
|
|
83
|
-
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
108
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
84
109
|
});
|
|
85
110
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
86
111
|
});
|
|
87
112
|
describe('WHEN we call expressErrorHandlerMiddleware with unexpected error', function () {
|
|
88
113
|
beforeEach(function () {
|
|
89
114
|
var err = new Error();
|
|
90
|
-
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
115
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
91
116
|
});
|
|
92
117
|
it('SHOULD set statusCode 500', function () { return expect(res.status.mock.calls[0][0]).toBe(500); });
|
|
93
118
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.formatPartner = exports.formatUser = exports.formatErrorForLogging = exports.expressHttpErrorHandler = exports.expressErrorHandlerMiddleware = void 0;
|
|
27
|
+
var undefsafe = __importStar(require("undefsafe"));
|
|
28
|
+
var errors_types_1 = require("./../../../errors/errors.types");
|
|
29
|
+
var errorMappers_1 = require("../../../errors/errorMappers");
|
|
30
|
+
var expressErrorHandlerMiddleware = function (options) { return function (err, req, res) {
|
|
31
|
+
return (0, exports.expressHttpErrorHandler)(options)(err, req, res);
|
|
6
32
|
}; };
|
|
33
|
+
exports.expressErrorHandlerMiddleware = expressErrorHandlerMiddleware;
|
|
7
34
|
function getStatusCodeForError(err) {
|
|
8
|
-
var isValidationError = isSwaggerValidationError(err) || isJoiError(err) || isSequelizeError(err);
|
|
35
|
+
var isValidationError = (0, errorMappers_1.isSwaggerValidationError)(err) || (0, errorMappers_1.isJoiError)(err) || (0, errorMappers_1.isSequelizeError)(err);
|
|
9
36
|
var defaultStatusCode = isValidationError ? 400 : 500;
|
|
10
37
|
return err.statusCode || err.status || defaultStatusCode;
|
|
11
38
|
}
|
|
12
|
-
|
|
39
|
+
var expressHttpErrorHandler = function (options) { return function (err, req, res) {
|
|
13
40
|
var logger = options.logger;
|
|
14
41
|
try {
|
|
15
42
|
var statusCode = getStatusCodeForError(err);
|
|
16
43
|
if (statusCode === 403) {
|
|
17
44
|
return res.status(statusCode).json(err);
|
|
18
45
|
}
|
|
19
|
-
var response = formatValidationErrorResponse(err);
|
|
46
|
+
var response = (0, errorMappers_1.formatValidationErrorResponse)(err);
|
|
20
47
|
if (response) {
|
|
21
48
|
switch (err.logLevel) {
|
|
22
|
-
case LogLevel.info:
|
|
49
|
+
case errors_types_1.LogLevel.info:
|
|
23
50
|
logger.info(formatErrorForLogging(req, err));
|
|
24
51
|
break;
|
|
25
|
-
case LogLevel.warn:
|
|
52
|
+
case errors_types_1.LogLevel.warn:
|
|
26
53
|
logger.warn(formatErrorForLogging(req, err));
|
|
27
54
|
break;
|
|
28
|
-
case LogLevel.error:
|
|
55
|
+
case errors_types_1.LogLevel.error:
|
|
29
56
|
logger.error(formatErrorForLogging(req, err));
|
|
30
57
|
break;
|
|
31
58
|
default:
|
|
@@ -41,15 +68,17 @@ export var expressHttpErrorHandler = function (options) { return function (err,
|
|
|
41
68
|
res.status(500).json('Unhandled error');
|
|
42
69
|
}
|
|
43
70
|
}; };
|
|
44
|
-
|
|
71
|
+
exports.expressHttpErrorHandler = expressHttpErrorHandler;
|
|
72
|
+
function formatErrorForLogging(req, error, prefix) {
|
|
45
73
|
if (prefix === void 0) { prefix = ''; }
|
|
46
|
-
var errorToString = mapErrorToString(error);
|
|
74
|
+
var errorToString = (0, errorMappers_1.mapErrorToString)(error);
|
|
47
75
|
var language = req.headers['accept-language'];
|
|
48
76
|
var userToString = JSON.stringify(formatUser(req.user));
|
|
49
77
|
var subdomain = (req.subdomains || []).join('.');
|
|
50
78
|
return "".concat(prefix, "URL: \"").concat(subdomain, " [").concat(req.method, "] ").concat(req.url, "\"; LANGUAGE: \"").concat(language, "\"; CURRENT_USER: \"").concat(userToString, "\"; ERROR: \"").concat(errorToString, "\";");
|
|
51
79
|
}
|
|
52
|
-
|
|
80
|
+
exports.formatErrorForLogging = formatErrorForLogging;
|
|
81
|
+
function formatUser(user) {
|
|
53
82
|
if (user === void 0) { user = {}; }
|
|
54
83
|
if (user && user.id) {
|
|
55
84
|
var baseUser = {
|
|
@@ -64,7 +93,8 @@ export function formatUser(user) {
|
|
|
64
93
|
}
|
|
65
94
|
return null;
|
|
66
95
|
}
|
|
67
|
-
|
|
96
|
+
exports.formatUser = formatUser;
|
|
97
|
+
function formatPartner(partner) {
|
|
68
98
|
if (partner === void 0) { partner = {}; }
|
|
69
99
|
if (partner) {
|
|
70
100
|
return {
|
|
@@ -75,4 +105,5 @@ export function formatPartner(partner) {
|
|
|
75
105
|
}
|
|
76
106
|
return null;
|
|
77
107
|
}
|
|
108
|
+
exports.formatPartner = formatPartner;
|
|
78
109
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsC;AAEtC,+DAAiE;AACjE,6DAMqC;AAO9B,IAAM,6BAA6B,GAAG,UAAC,OAA6B,IAAK,OAAA,UAAC,GAAgB,EAAE,GAAQ,EAAE,GAAQ;IACnH,OAAO,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AACxD,CAAC,EAF+E,CAE/E,CAAA;AAFY,QAAA,6BAA6B,iCAEzC;AAED,SAAS,qBAAqB,CAAC,GAAU;IACvC,IAAM,iBAAiB,GAAG,IAAA,uCAAwB,EAAC,GAAG,CAAC,IAAI,IAAA,yBAAU,EAAC,GAAG,CAAC,IAAI,IAAA,+BAAgB,EAAC,GAAG,CAAC,CAAA;IACnG,IAAM,iBAAiB,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAEvD,OAAQ,GAAuB,CAAC,UAAU,IAAK,GAAW,CAAC,MAAM,IAAI,iBAAiB,CAAA;AACxF,CAAC;AAEM,IAAM,uBAAuB,GAAG,UAAC,OAA6B,IAAK,OAAA,UAAC,GAAgB,EAAE,GAAQ,EAAE,GAAQ;IACrG,IAAA,MAAM,GAAK,OAAO,OAAZ,CAAY;IAE1B,IAAI;QACF,IAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;QAE7C,IAAI,UAAU,KAAK,GAAG,EAAE;YACtB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACxC;QAED,IAAM,QAAQ,GAAG,IAAA,4CAA6B,EAAC,GAAG,CAAC,CAAA;QAEnD,IAAI,QAAQ,EAAE;YACZ,QAAS,GAAc,CAAC,QAAQ,EAAE;gBAChC,KAAK,uBAAQ,CAAC,IAAI;oBAChB,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;oBAC5C,MAAK;gBAEP,KAAK,uBAAQ,CAAC,IAAI;oBAChB,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;oBAC5C,MAAK;gBAEP,KAAK,uBAAQ,CAAC,KAAK;oBACjB,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;oBAC7C,MAAK;gBAEP;oBACE,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;aAC/C;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAC7C;QAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QAC7C,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,2BAA2B,CAAC,CAAC,CAAA;QAC1E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;KACxC;AACH,CAAC,EAvCyE,CAuCzE,CAAA;AAvCY,QAAA,uBAAuB,2BAuCnC;AAED,SAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,MAAW;IAAX,uBAAA,EAAA,WAAW;IAC3D,IAAM,aAAa,GAAW,IAAA,+BAAgB,EAAC,KAAK,CAAC,CAAA;IACrD,IAAM,QAAQ,GAAW,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACvD,IAAM,YAAY,GAAW,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IACjE,IAAM,SAAS,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClD,OAAO,UAAG,MAAM,oBAAS,SAAS,eAAK,GAAG,CAAC,MAAM,eAAK,GAAG,CAAC,GAAG,6BAAiB,QAAQ,iCAAqB,YAAY,0BAAc,aAAa,QAAI,CAAA;AACxJ,CAAC;AAND,sDAMC;AAED,SAAgB,UAAU,CAAC,IAAc;IAAd,qBAAA,EAAA,SAAc;IACvC,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE;QACnB,IAAM,QAAQ,GAAG;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAA;QAED,IAAI,SAAS,CAAC,IAAI,EAAE,mBAAmB,CAAC,EAAE;YACxC,CAAC;YAAC,QAAgB,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;SACpE;QAED,OAAO,QAAQ,CAAA;KAChB;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAdD,gCAcC;AAED,SAAgB,aAAa,CAAC,OAAiB;IAAjB,wBAAA,EAAA,YAAiB;IAC7C,IAAI,OAAO,EAAE;QACX,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AATD,sCASC"}
|
|
@@ -1,8 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.expressHttpErrorHandler = exports.expressErrorHandlerMiddleware = exports.responseHelpersMiddleware = exports.translationsMiddleware = exports.companyMiddleware = exports.partnerMiddleware = exports.aliveMiddleware = exports.languageMiddleware = void 0;
|
|
4
|
+
var languageMiddleware_1 = require("./languageMiddleware");
|
|
5
|
+
Object.defineProperty(exports, "languageMiddleware", { enumerable: true, get: function () { return languageMiddleware_1.languageMiddleware; } });
|
|
6
|
+
var aliveMiddleware_1 = require("./aliveMiddleware");
|
|
7
|
+
Object.defineProperty(exports, "aliveMiddleware", { enumerable: true, get: function () { return aliveMiddleware_1.aliveMiddleware; } });
|
|
8
|
+
var partnerMiddleware_1 = require("./partnerMiddleware");
|
|
9
|
+
Object.defineProperty(exports, "partnerMiddleware", { enumerable: true, get: function () { return partnerMiddleware_1.partnerMiddleware; } });
|
|
10
|
+
var companyMiddleware_1 = require("./companyMiddleware");
|
|
11
|
+
Object.defineProperty(exports, "companyMiddleware", { enumerable: true, get: function () { return companyMiddleware_1.companyMiddleware; } });
|
|
12
|
+
var translationsMiddleware_1 = require("./translationsMiddleware");
|
|
13
|
+
Object.defineProperty(exports, "translationsMiddleware", { enumerable: true, get: function () { return translationsMiddleware_1.translationsMiddleware; } });
|
|
14
|
+
var responseHelpersMiddleware_1 = require("./responseHelpersMiddleware");
|
|
15
|
+
Object.defineProperty(exports, "responseHelpersMiddleware", { enumerable: true, get: function () { return responseHelpersMiddleware_1.responseHelpersMiddleware; } });
|
|
16
|
+
var expressErrorHandlerMiddleware_1 = require("./expressErrorHandlerMiddleware");
|
|
17
|
+
Object.defineProperty(exports, "expressErrorHandlerMiddleware", { enumerable: true, get: function () { return expressErrorHandlerMiddleware_1.expressErrorHandlerMiddleware; } });
|
|
18
|
+
Object.defineProperty(exports, "expressHttpErrorHandler", { enumerable: true, get: function () { return expressErrorHandlerMiddleware_1.expressHttpErrorHandler; } });
|
|
8
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/express/middleware/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/express/middleware/index.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAC3B,qDAAmD;AAA1C,kHAAA,eAAe,OAAA;AACxB,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,mEAAiE;AAAxD,gIAAA,sBAAsB,OAAA;AAC/B,yEAAuE;AAA9D,sIAAA,yBAAyB,OAAA;AAClC,iFAAwG;AAA/F,8IAAA,6BAA6B,OAAA;AAAE,wIAAA,uBAAuB,OAAA"}
|
|
@@ -1,10 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.languageMiddleware = void 0;
|
|
27
|
+
var cookieService = __importStar(require("../../../services/cookieService/cookieService"));
|
|
28
|
+
var languageService = __importStar(require("../../../services/languageService/languageService"));
|
|
29
|
+
var constants_1 = require("./../../../helpers/constants");
|
|
4
30
|
function getRequestLanguage(params) {
|
|
5
31
|
if (params === void 0) { params = {}; }
|
|
6
32
|
var req = params.req, _a = params.useCookies, useCookies = _a === void 0 ? false : _a;
|
|
7
|
-
var allLanguages = ALL_LANGUAGES || [];
|
|
33
|
+
var allLanguages = constants_1.ALL_LANGUAGES || [];
|
|
8
34
|
var acceptedLanguage = req.acceptsLanguages.apply(req, allLanguages);
|
|
9
35
|
var cookieLanguage = useCookies ? cookieService.getCookie({ req: req, name: 'accept-language' }) : undefined;
|
|
10
36
|
return {
|
|
@@ -12,9 +38,9 @@ function getRequestLanguage(params) {
|
|
|
12
38
|
acceptedLanguage: acceptedLanguage,
|
|
13
39
|
};
|
|
14
40
|
}
|
|
15
|
-
|
|
41
|
+
function languageMiddleware(params) {
|
|
16
42
|
if (params === void 0) { params = {}; }
|
|
17
|
-
var _a = params.defaultLanguage, defaultLanguage = _a === void 0 ? LANGUAGES.EN_US : _a, _b = params.useCookies, useCookies = _b === void 0 ? false : _b;
|
|
43
|
+
var _a = params.defaultLanguage, defaultLanguage = _a === void 0 ? constants_1.LANGUAGES.EN_US : _a, _b = params.useCookies, useCookies = _b === void 0 ? false : _b;
|
|
18
44
|
return function (req, res, next) {
|
|
19
45
|
var languages = getRequestLanguage({ req: req, useCookies: useCookies });
|
|
20
46
|
var currentLanguage = languages.cookieLanguage || languages.acceptedLanguage || defaultLanguage;
|
|
@@ -27,13 +53,13 @@ export function languageMiddleware(params) {
|
|
|
27
53
|
});
|
|
28
54
|
}
|
|
29
55
|
/* eslint no-param-reassign: 0 */
|
|
30
|
-
req.getAllLanguages = function () { return ALL_LANGUAGES; };
|
|
56
|
+
req.getAllLanguages = function () { return constants_1.ALL_LANGUAGES; };
|
|
31
57
|
/* eslint no-param-reassign: 0 */
|
|
32
58
|
req.getLanguage = function () { return currentLanguage; };
|
|
33
59
|
/* eslint no-param-reassign: 0 */
|
|
34
60
|
req.setLanguage = function (_a) {
|
|
35
61
|
var _b = _a === void 0 ? {} : _a, _c = _b.language, language = _c === void 0 ? '' : _c;
|
|
36
|
-
if (ALL_LANGUAGES.includes(language)) {
|
|
62
|
+
if (constants_1.ALL_LANGUAGES.includes(language)) {
|
|
37
63
|
currentLanguage = language;
|
|
38
64
|
if (useCookies) {
|
|
39
65
|
languageService.setCurrentLanguage({
|
|
@@ -47,4 +73,5 @@ export function languageMiddleware(params) {
|
|
|
47
73
|
return next();
|
|
48
74
|
};
|
|
49
75
|
}
|
|
76
|
+
exports.languageMiddleware = languageMiddleware;
|
|
50
77
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/languageMiddleware/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/languageMiddleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2FAA8E;AAC9E,iGAAoF;AACpF,0DAAuE;AAUvE,SAAS,kBAAkB,CAAC,MAAqC;IAArC,uBAAA,EAAA,WAAqC;IACvD,IAAA,GAAG,GAAyB,MAAM,IAA/B,EAAE,KAAuB,MAAM,WAAX,EAAlB,UAAU,mBAAG,KAAK,KAAA,CAAW;IAC1C,IAAM,YAAY,GAAG,yBAAa,IAAI,EAAE,CAAA;IACxC,IAAM,gBAAgB,GAAW,GAAG,CAAC,gBAAgB,OAApB,GAAG,EAAqB,YAAY,CAAC,CAAA;IACtE,IAAM,cAAc,GAAW,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,GAAG,KAAA,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEjH,OAAO;QACL,cAAc,gBAAA;QACd,gBAAgB,kBAAA;KACjB,CAAA;AACH,CAAC;AAMD,SAAgB,kBAAkB,CAAC,MAAsC;IAAtC,uBAAA,EAAA,WAAsC;IAC/D,IAAA,KAA0D,MAAM,gBAA/B,EAAjC,eAAe,mBAAG,qBAAS,CAAC,KAAK,KAAA,EAAE,KAAuB,MAAM,WAAX,EAAlB,UAAU,mBAAG,KAAK,KAAA,CAAW;IAExE,OAAO,UAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QACpB,IAAM,SAAS,GAAgC,kBAAkB,CAAC,EAAE,GAAG,KAAA,EAAE,UAAU,YAAA,EAAE,CAAC,CAAA;QACtF,IAAI,eAAe,GAAW,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,gBAAgB,IAAI,eAAe,CAAA;QAEvG,8CAA8C;QAC9C,IAAI,UAAU,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;YAC3C,eAAe,CAAC,kBAAkB,CAAC;gBACjC,GAAG,KAAA;gBACH,GAAG,KAAA;gBACH,QAAQ,EAAE,SAAS,CAAC,gBAAgB,IAAI,eAAe;aACxD,CAAC,CAAA;SACH;QAED,iCAAiC;QACjC,GAAG,CAAC,eAAe,GAAG,cAAM,OAAA,yBAAa,EAAb,CAAa,CAAA;QAEzC,iCAAiC;QACjC,GAAG,CAAC,WAAW,GAAG,cAAM,OAAA,eAAe,EAAf,CAAe,CAAA;QAEvC,iCAAiC;QACjC,GAAG,CAAC,WAAW,GAAG,UAAC,EAAsB;gBAAtB,qBAAoB,EAAE,KAAA,EAApB,gBAAa,EAAb,QAAQ,mBAAG,EAAE,KAAA;YAChC,IAAI,yBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACpC,eAAe,GAAG,QAAQ,CAAA;gBAE1B,IAAI,UAAU,EAAE;oBACd,eAAe,CAAC,kBAAkB,CAAC;wBACjC,GAAG,KAAA;wBACH,GAAG,KAAA;wBACH,QAAQ,EAAE,eAAe,IAAI,eAAe;qBAC7C,CAAC,CAAA;iBACH;aACF;QACH,CAAC,CAAA;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC;AAvCD,gDAuCC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.partnerMiddleware = void 0;
|
|
4
|
+
var partner_1 = require("./partner");
|
|
5
|
+
var partnerMiddleware = function (_a) {
|
|
3
6
|
var _b = _a === void 0 ? {} : _a, _c = _b.getPartnerFunction, getPartnerFunction = _c === void 0 ? null : _c, // (subdomain) => Promise.resolve(),
|
|
4
7
|
_d = _b.getPartnerUrl, // (subdomain) => Promise.resolve(),
|
|
5
8
|
getPartnerUrl = _d === void 0 ? null : _d, // (subdomain) => '',
|
|
6
9
|
_e = _b.cacheTtl, // (subdomain) => '',
|
|
7
|
-
cacheTtl = _e === void 0 ? DEFAULT_TTL : _e, // seconds
|
|
10
|
+
cacheTtl = _e === void 0 ? partner_1.DEFAULT_TTL : _e, // seconds
|
|
8
11
|
_f = _b.options, // seconds
|
|
9
12
|
_g = _f === void 0 ? {} : _f, _h = _g.subdomainExtraParts, subdomainExtraParts = _h === void 0 ? [] : _h;
|
|
10
13
|
return function (req, _res, next) {
|
|
11
14
|
req.currentPartner = null; // eslint-disable-line no-param-reassign
|
|
12
15
|
var subdomain = getPartnerSubdomainName(req, subdomainExtraParts);
|
|
13
|
-
getPartner({ subdomain: subdomain, getPartnerUrl: getPartnerUrl, getPartnerFunction: getPartnerFunction, cacheTtl: cacheTtl })
|
|
16
|
+
(0, partner_1.getPartner)({ subdomain: subdomain, getPartnerUrl: getPartnerUrl, getPartnerFunction: getPartnerFunction, cacheTtl: cacheTtl })
|
|
14
17
|
.then(function (partner) {
|
|
15
18
|
req.currentPartner = partner; // eslint-disable-line no-param-reassign
|
|
16
19
|
return next();
|
|
@@ -21,6 +24,7 @@ export var partnerMiddleware = function (_a) {
|
|
|
21
24
|
});
|
|
22
25
|
};
|
|
23
26
|
};
|
|
27
|
+
exports.partnerMiddleware = partnerMiddleware;
|
|
24
28
|
function getPartnerSubdomainName(req, subdomainExtraParts) {
|
|
25
29
|
return req.subdomains.filter(function (part) { return !subdomainExtraParts.includes(part); }).join('');
|
|
26
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/partnerMiddleware/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/partnerMiddleware/index.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAW5C,IAAM,iBAAiB,GAC5B,UAAC,EAKK;QALL,qBAKG,EAAE,KAAA,EAJJ,0BAAyB,EAAzB,kBAAkB,mBAAG,IAAI,KAAA,EAAE,oCAAoC;IAC/D,qBAAoB,EADO,oCAAoC;IAC/D,aAAa,mBAAG,IAAI,KAAA,EAAE,qBAAqB;IAC3C,gBAAsB,EADA,qBAAqB;IAC3C,QAAQ,mBAAG,qBAAW,KAAA,EAAE,UAAU;IAClC,eAA0C,EADlB,UAAU;IAClC,qBAAwC,EAAE,KAAA,EAA/B,2BAAwB,EAAxB,mBAAmB,mBAAG,EAAE,KAAA;IAErC,OAAA,UAAC,GAAG,EAAE,IAAI,EAAE,IAAI;QACd,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA,CAAC,wCAAwC;QAElE,IAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;QACnE,IAAA,oBAAU,EAAC,EAAE,SAAS,WAAA,EAAE,aAAa,eAAA,EAAE,kBAAkB,oBAAA,EAAE,QAAQ,UAAA,EAAE,CAAC;aACnE,IAAI,CAAC,UAAC,OAAO;YACZ,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA,CAAC,wCAAwC;YACrE,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC;aACD,KAAK,CAAC;YACL,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA,CAAC,wCAAwC;YAClE,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;AAbD,CAaC,CAAA;AApBU,QAAA,iBAAiB,qBAoB3B;AAEH,SAAS,uBAAuB,CAAC,GAAG,EAAE,mBAAmB;IACvD,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAnC,CAAmC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACtF,CAAC"}
|