@hyper.software/common-helpers 1.0.14 → 1.0.15
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 +3 -6
- package/lib/errors/CriticalError.js.map +1 -1
- package/lib/errors/ValidationError.js +3 -6
- package/lib/errors/ValidationError.js.map +1 -1
- package/lib/errors/ValidationErrorSilent.js +5 -8
- package/lib/errors/ValidationErrorSilent.js.map +1 -1
- package/lib/errors/ValidationErrorWithStatus.js +3 -6
- package/lib/errors/ValidationErrorWithStatus.js.map +1 -1
- package/lib/errors/ValidationErrorWithStatusSilent.js +5 -8
- package/lib/errors/ValidationErrorWithStatusSilent.js.map +1 -1
- package/lib/errors/__mocks__/errors.mock.js +4 -7
- package/lib/errors/__mocks__/errors.mock.js.map +1 -1
- package/lib/errors/__tests__/errorMappers.test.js +2 -4
- package/lib/errors/__tests__/errorMappers.test.js.map +1 -1
- package/lib/errors/__tests__/errors.test.js +18 -20
- package/lib/errors/__tests__/errors.test.js.map +1 -1
- package/lib/errors/errorMappers.js +21 -36
- package/lib/errors/errorMappers.js.map +1 -1
- package/lib/errors/errors.types.js +2 -5
- package/lib/errors/errors.types.js.map +1 -1
- package/lib/errors/index.js +5 -13
- package/lib/errors/index.js.map +1 -1
- package/lib/express/__tests__/swaggerHelpers.test.js +2 -4
- package/lib/express/__tests__/swaggerHelpers.test.js.map +1 -1
- package/lib/express/middleware/aliveMiddleware/index.js +1 -5
- package/lib/express/middleware/aliveMiddleware/index.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/company.js +8 -15
- package/lib/express/middleware/companyMiddleware/company.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/companyApiRequest.js +3 -10
- package/lib/express/middleware/companyMiddleware/companyApiRequest.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/index.js +4 -8
- package/lib/express/middleware/companyMiddleware/index.js.map +1 -1
- package/lib/express/middleware/companyMiddleware/index.types.js +1 -2
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js +15 -40
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js.map +1 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js +15 -46
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js.map +1 -1
- package/lib/express/middleware/index.js +7 -18
- package/lib/express/middleware/index.js.map +1 -1
- package/lib/express/middleware/languageMiddleware/index.js +8 -35
- package/lib/express/middleware/languageMiddleware/index.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/index.js +4 -8
- package/lib/express/middleware/partnerMiddleware/index.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/index.types.js +1 -2
- package/lib/express/middleware/partnerMiddleware/partner.js +8 -15
- package/lib/express/middleware/partnerMiddleware/partner.js.map +1 -1
- package/lib/express/middleware/partnerMiddleware/partnerServiceRequest.js +3 -10
- package/lib/express/middleware/partnerMiddleware/partnerServiceRequest.js.map +1 -1
- package/lib/express/middleware/responseHelpersMiddleware/index.js +3 -7
- package/lib/express/middleware/responseHelpersMiddleware/index.js.map +1 -1
- package/lib/express/middleware/responseHelpersMiddleware/types.js +1 -2
- package/lib/express/middleware/translationsMiddleware/index.js +3 -7
- package/lib/express/middleware/translationsMiddleware/index.js.map +1 -1
- package/lib/express/swaggerControllersConfig.js +3 -7
- package/lib/express/swaggerControllersConfig.js.map +1 -1
- package/lib/express/swaggerHelpers.js +1 -5
- package/lib/express/swaggerHelpers.js.map +1 -1
- package/lib/express/swaggerUiController.js +5 -10
- package/lib/express/swaggerUiController.js.map +1 -1
- package/lib/express/swaggerUiTemplate.js +2 -7
- package/lib/express/swaggerUiTemplate.js.map +1 -1
- package/lib/helpers/ExecuteOnce.js +1 -4
- package/lib/helpers/ExecuteOnce.js.map +1 -1
- package/lib/helpers/UniversalConfig.js +2 -28
- package/lib/helpers/UniversalConfig.js.map +1 -1
- package/lib/helpers/__tests__/arrays.test.js +1 -26
- package/lib/helpers/__tests__/arrays.test.js.map +1 -1
- package/lib/helpers/__tests__/emptyValues.test.js +3 -5
- package/lib/helpers/__tests__/emptyValues.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatCurrency.test.js +7 -9
- package/lib/helpers/__tests__/formatters.formatCurrency.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatDate.test.js +35 -37
- package/lib/helpers/__tests__/formatters.formatDate.test.js.map +1 -1
- package/lib/helpers/__tests__/formatters.formatDouble.test.js +2 -4
- package/lib/helpers/__tests__/formatters.formatDouble.test.js.map +1 -1
- package/lib/helpers/__tests__/navigation.test.js +10 -12
- package/lib/helpers/__tests__/navigation.test.js.map +1 -1
- package/lib/helpers/__tests__/strings.test.js +3 -5
- package/lib/helpers/__tests__/strings.test.js.map +1 -1
- package/lib/helpers/__tests__/validation.test.js +115 -140
- package/lib/helpers/__tests__/validation.test.js.map +1 -1
- package/lib/helpers/arrays.js +1 -5
- package/lib/helpers/arrays.js.map +1 -1
- package/lib/helpers/clientLogger.js +15 -48
- package/lib/helpers/clientLogger.js.map +1 -1
- package/lib/helpers/constants/common.js +29 -34
- package/lib/helpers/constants/common.js.map +1 -1
- package/lib/helpers/constants/fileUploads.js +1 -4
- package/lib/helpers/constants/fileUploads.js.map +1 -1
- package/lib/helpers/constants/index.js +13 -31
- package/lib/helpers/constants/index.js.map +1 -1
- package/lib/helpers/constants/integrations.js +12 -15
- package/lib/helpers/constants/integrations.js.map +1 -1
- package/lib/helpers/constants/language.js +3 -6
- package/lib/helpers/constants/language.js.map +1 -1
- package/lib/helpers/constants/swagger.js +4 -7
- package/lib/helpers/constants/swagger.js.map +1 -1
- package/lib/helpers/constants/urls.js +1 -4
- package/lib/helpers/constants/urls.js.map +1 -1
- package/lib/helpers/constants/user.js +4 -7
- package/lib/helpers/constants/user.js.map +1 -1
- package/lib/helpers/constants/validators.js +3 -6
- package/lib/helpers/constants/validators.js.map +1 -1
- package/lib/helpers/emptyValues.js +5 -33
- package/lib/helpers/emptyValues.js.map +1 -1
- package/lib/helpers/formatters.js +10 -41
- package/lib/helpers/formatters.js.map +1 -1
- package/lib/helpers/guards.js +5 -9
- package/lib/helpers/guards.js.map +1 -1
- package/lib/helpers/index.js +6 -24
- package/lib/helpers/index.js.map +1 -1
- package/lib/helpers/isBrowser.js +1 -5
- package/lib/helpers/isBrowser.js.map +1 -1
- package/lib/helpers/math.js +13 -18
- package/lib/helpers/math.js.map +1 -1
- package/lib/helpers/moment.js +8 -13
- package/lib/helpers/moment.js.map +1 -1
- package/lib/helpers/navigation.js +9 -41
- package/lib/helpers/navigation.js.map +1 -1
- package/lib/helpers/stringifySafe.js +1 -5
- package/lib/helpers/stringifySafe.js.map +1 -1
- package/lib/helpers/strings.js +6 -13
- package/lib/helpers/strings.js.map +1 -1
- package/lib/helpers/validation.js +44 -98
- package/lib/helpers/validation.js.map +1 -1
- package/lib/index.js +3 -19
- package/lib/index.js.map +1 -1
- package/lib/interfaces.js +5 -8
- package/lib/interfaces.js.map +1 -1
- package/lib/redux/analyticsMiddleware.js +3 -30
- package/lib/redux/analyticsMiddleware.js.map +1 -1
- package/lib/redux/clientMiddleware.js +2 -29
- package/lib/redux/clientMiddleware.js.map +1 -1
- package/lib/redux/emptyMiddleware.js +1 -5
- package/lib/redux/emptyMiddleware.js.map +1 -1
- package/lib/redux/index.js +3 -9
- package/lib/redux/index.js.map +1 -1
- package/lib/services/cookieService/cookieService.js +4 -33
- package/lib/services/cookieService/cookieService.js.map +1 -1
- package/lib/services/googleAnalyticsService/googleAnalyticsService.js +10 -20
- package/lib/services/googleAnalyticsService/googleAnalyticsService.js.map +1 -1
- package/lib/services/imageService/imageService.js +6 -34
- package/lib/services/imageService/imageService.js.map +1 -1
- package/lib/services/index.js +10 -36
- package/lib/services/index.js.map +1 -1
- package/lib/services/languageService/languageService.js +13 -42
- package/lib/services/languageService/languageService.js.map +1 -1
- package/lib/services/localstorageService/localstorageService.js +2 -7
- package/lib/services/localstorageService/localstorageService.js.map +1 -1
- package/lib/services/sessionStorageService/index.js +2 -7
- package/lib/services/sessionStorageService/index.js.map +1 -1
- package/lib/translations/getAllTranslations.js +7 -34
- package/lib/translations/getAllTranslations.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.aliveMiddleware = void 0;
|
|
4
|
-
function aliveMiddleware(_a) {
|
|
1
|
+
export function aliveMiddleware(_a) {
|
|
5
2
|
var _b = _a === void 0 ? {} : _a, _c = _b.metadata, metadata = _c === void 0 ? {} : _c;
|
|
6
3
|
var name = metadata.name, version = metadata.version, engines = metadata.engines, description = metadata.description;
|
|
7
4
|
var startedAt = new Date();
|
|
@@ -19,5 +16,4 @@ function aliveMiddleware(_a) {
|
|
|
19
16
|
});
|
|
20
17
|
};
|
|
21
18
|
}
|
|
22
|
-
exports.aliveMiddleware = aliveMiddleware;
|
|
23
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/aliveMiddleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/aliveMiddleware/index.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,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"}
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
var
|
|
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;
|
|
1
|
+
import NodeCache from 'node-cache';
|
|
2
|
+
import { getCompanyFromApi } from './companyApiRequest';
|
|
3
|
+
export var DEFAULT_TTL = 5 * 60; // in seconds
|
|
4
|
+
export var CHECK_CACHE_PERIOD = 1 * 60; // in seconds
|
|
5
|
+
var companyCache = new NodeCache({ stdTTL: DEFAULT_TTL, checkperiod: CHECK_CACHE_PERIOD });
|
|
6
|
+
export function getCompany(_a) {
|
|
7
|
+
var subdomain = _a.subdomain, getCompanyUrl = _a.getCompanyUrl, getCompanyFunction = _a.getCompanyFunction, _b = _a.cacheTtl, cacheTtl = _b === void 0 ? DEFAULT_TTL : _b;
|
|
14
8
|
var cacheKey = "company_".concat(subdomain);
|
|
15
9
|
var cachedCompany = companyCache.get(cacheKey);
|
|
16
10
|
if (!subdomain) {
|
|
@@ -19,10 +13,9 @@ function getCompany(_a) {
|
|
|
19
13
|
if (cachedCompany) {
|
|
20
14
|
return Promise.resolve(cachedCompany);
|
|
21
15
|
}
|
|
22
|
-
return
|
|
16
|
+
return getCompanyFromApi({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction }).then(function (company) {
|
|
23
17
|
companyCache.set(cacheKey, company, cacheTtl);
|
|
24
18
|
return company;
|
|
25
19
|
});
|
|
26
20
|
}
|
|
27
|
-
exports.getCompany = getCompany;
|
|
28
21
|
//# sourceMappingURL=company.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"company.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/company.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"company.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/company.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,MAAM,CAAC,IAAM,WAAW,GAAG,CAAC,GAAG,EAAE,CAAA,CAAC,aAAa;AAC/C,MAAM,CAAC,IAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,CAAA,CAAC,aAAa;AACtD,IAAM,YAAY,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAA;AAQ5F,MAAM,UAAU,UAAU,CAAC,EAA4F;QAA1F,SAAS,eAAA,EAAE,aAAa,mBAAA,EAAE,kBAAkB,wBAAA,EAAE,gBAAsB,EAAtB,QAAQ,mBAAG,WAAW,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,iBAAiB,CAAC,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"}
|
|
@@ -1,22 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
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) {
|
|
1
|
+
import axios from 'axios';
|
|
2
|
+
export function getCompanyFromApi(_a) {
|
|
9
3
|
var subdomain = _a.subdomain, getCompanyUrl = _a.getCompanyUrl, getCompanyFunction = _a.getCompanyFunction;
|
|
10
4
|
if (!subdomain) {
|
|
11
5
|
return Promise.resolve(null);
|
|
12
6
|
}
|
|
13
7
|
if (getCompanyUrl) {
|
|
14
|
-
return
|
|
8
|
+
return axios.get(getCompanyUrl(subdomain)).then(function (response) { return response.data; });
|
|
15
9
|
}
|
|
16
10
|
if (getCompanyFunction) {
|
|
17
11
|
return getCompanyFunction(subdomain);
|
|
18
12
|
}
|
|
19
13
|
return Promise.resolve(null);
|
|
20
14
|
}
|
|
21
|
-
exports.getCompanyFromApi = getCompanyFromApi;
|
|
22
15
|
//# sourceMappingURL=companyApiRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"companyApiRequest.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/companyApiRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"companyApiRequest.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/companyApiRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,MAAM,UAAU,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,KAAK,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"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.companyMiddleware = void 0;
|
|
4
|
-
var company_1 = require("./company");
|
|
5
|
-
var companyMiddleware = function (_a) {
|
|
1
|
+
import { getCompany, DEFAULT_TTL } from './company';
|
|
2
|
+
export var companyMiddleware = function (_a) {
|
|
6
3
|
var _b = _a === void 0 ? {} : _a, _c = _b.getCompanyFunction, getCompanyFunction = _c === void 0 ? null : _c, // (subdomain) => Promise.resolve(),
|
|
7
4
|
_d = _b.getCompanyUrl, // (subdomain) => Promise.resolve(),
|
|
8
5
|
getCompanyUrl = _d === void 0 ? null : _d, // (subdomain) => '',
|
|
9
6
|
_e = _b.cacheTtl, // (subdomain) => '',
|
|
10
|
-
cacheTtl = _e === void 0 ?
|
|
7
|
+
cacheTtl = _e === void 0 ? DEFAULT_TTL : _e, // seconds
|
|
11
8
|
_f = _b.options, // seconds
|
|
12
9
|
_g = _f === void 0 ? {} : _f, _h = _g.subdomainExtraParts, subdomainExtraParts = _h === void 0 ? [] : _h;
|
|
13
10
|
return function (req, _res, next) {
|
|
14
11
|
req.currentCompany = null; // eslint-disable-line no-param-reassign
|
|
15
12
|
var subdomain = getCompanySubdomainName(req, subdomainExtraParts);
|
|
16
|
-
|
|
13
|
+
getCompany({ subdomain: subdomain, getCompanyUrl: getCompanyUrl, getCompanyFunction: getCompanyFunction, cacheTtl: cacheTtl })
|
|
17
14
|
.then(function (company) {
|
|
18
15
|
req.currentCompany = company; // eslint-disable-line no-param-reassign
|
|
19
16
|
return next();
|
|
@@ -24,7 +21,6 @@ var companyMiddleware = function (_a) {
|
|
|
24
21
|
});
|
|
25
22
|
};
|
|
26
23
|
};
|
|
27
|
-
exports.companyMiddleware = companyMiddleware;
|
|
28
24
|
function getCompanySubdomainName(req, subdomainExtraParts) {
|
|
29
25
|
return req.subdomains.filter(function (part) { return !subdomainExtraParts.includes(part); }).join('');
|
|
30
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/companyMiddleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAWnD,MAAM,CAAC,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,WAAW,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,UAAU,CAAC,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;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,31 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
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"));
|
|
1
|
+
import { ValidationError, ValidationErrorSilent, ValidationErrorWithStatus, ValidationErrorWithStatusSilent, } from '../../../../errors';
|
|
2
|
+
import { expressErrorHandlerMiddleware } from '../';
|
|
3
|
+
import * as httpMock from 'node-mocks-http';
|
|
29
4
|
var logger = {
|
|
30
5
|
info: jest.fn(),
|
|
31
6
|
warn: jest.fn(),
|
|
@@ -44,8 +19,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
44
19
|
});
|
|
45
20
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationError Error', function () {
|
|
46
21
|
beforeEach(function () {
|
|
47
|
-
var validErr = new
|
|
48
|
-
|
|
22
|
+
var validErr = new ValidationError('General Validation Error Message', 'api.test.message.general', {});
|
|
23
|
+
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
49
24
|
});
|
|
50
25
|
it('SHOULD return the default 400 status', function () {
|
|
51
26
|
expect(res.status.mock.calls[0][0]).toBe(400);
|
|
@@ -54,8 +29,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
54
29
|
});
|
|
55
30
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatus Error', function () {
|
|
56
31
|
beforeEach(function () {
|
|
57
|
-
var validErr = new
|
|
58
|
-
|
|
32
|
+
var validErr = new ValidationErrorWithStatus(123, 'Custom Error Message', 'api.test.message', {});
|
|
33
|
+
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
59
34
|
});
|
|
60
35
|
it('SHOULD return the status sent to ValidationErrorWithStatus', function () {
|
|
61
36
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -64,8 +39,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
64
39
|
});
|
|
65
40
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatusSilent Error', function () {
|
|
66
41
|
beforeEach(function () {
|
|
67
|
-
var validErr = new
|
|
68
|
-
|
|
42
|
+
var validErr = new ValidationErrorWithStatusSilent(123, 'Custom Error Message', 'api.test.message', {});
|
|
43
|
+
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
69
44
|
});
|
|
70
45
|
it('SHOULD return the status sent to ValidationErrorWithStatusSilent', function () {
|
|
71
46
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -76,8 +51,8 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
76
51
|
});
|
|
77
52
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorSilent Error', function () {
|
|
78
53
|
beforeEach(function () {
|
|
79
|
-
var validErr = new
|
|
80
|
-
|
|
54
|
+
var validErr = new ValidationErrorSilent('Custom Error Message', 'custom.error.locale', {});
|
|
55
|
+
expressErrorHandlerMiddleware({ logger: logger })(validErr, req, res);
|
|
81
56
|
});
|
|
82
57
|
it('SHOULD call logger.info and not logger.warn', function () {
|
|
83
58
|
expect(logger.info).toBeCalled();
|
|
@@ -89,7 +64,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
89
64
|
beforeEach(function () {
|
|
90
65
|
var err = new Error();
|
|
91
66
|
err.name = 'Sequelize Error';
|
|
92
|
-
|
|
67
|
+
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
93
68
|
});
|
|
94
69
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
95
70
|
});
|
|
@@ -97,7 +72,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
97
72
|
beforeEach(function () {
|
|
98
73
|
var err = new Error();
|
|
99
74
|
err.isJoi = true;
|
|
100
|
-
|
|
75
|
+
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
101
76
|
});
|
|
102
77
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
103
78
|
});
|
|
@@ -105,14 +80,14 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
105
80
|
beforeEach(function () {
|
|
106
81
|
var err = new Error();
|
|
107
82
|
err.code = 'SCHEMA_VALIDATION_FAILED';
|
|
108
|
-
|
|
83
|
+
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
109
84
|
});
|
|
110
85
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
111
86
|
});
|
|
112
87
|
describe('WHEN we call expressErrorHandlerMiddleware with unexpected error', function () {
|
|
113
88
|
beforeEach(function () {
|
|
114
89
|
var err = new Error();
|
|
115
|
-
|
|
90
|
+
expressErrorHandlerMiddleware({ logger: logger })(err, req, res);
|
|
116
91
|
});
|
|
117
92
|
it('SHOULD set statusCode 500', function () { return expect(res.status.mock.calls[0][0]).toBe(500); });
|
|
118
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,58 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
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);
|
|
1
|
+
import * as undefsafe from 'undefsafe';
|
|
2
|
+
import { LogLevel } from './../../../errors/errors.types';
|
|
3
|
+
import { formatValidationErrorResponse, mapErrorToString, isSwaggerValidationError, isJoiError, isSequelizeError, } from '../../../errors/errorMappers';
|
|
4
|
+
export var expressErrorHandlerMiddleware = function (options) { return function (err, req, res) {
|
|
5
|
+
return expressHttpErrorHandler(options)(err, req, res);
|
|
32
6
|
}; };
|
|
33
|
-
exports.expressErrorHandlerMiddleware = expressErrorHandlerMiddleware;
|
|
34
7
|
function getStatusCodeForError(err) {
|
|
35
|
-
var isValidationError =
|
|
8
|
+
var isValidationError = isSwaggerValidationError(err) || isJoiError(err) || isSequelizeError(err);
|
|
36
9
|
var defaultStatusCode = isValidationError ? 400 : 500;
|
|
37
10
|
return err.statusCode || err.status || defaultStatusCode;
|
|
38
11
|
}
|
|
39
|
-
var expressHttpErrorHandler = function (options) { return function (err, req, res) {
|
|
12
|
+
export var expressHttpErrorHandler = function (options) { return function (err, req, res) {
|
|
40
13
|
var logger = options.logger;
|
|
41
14
|
try {
|
|
42
15
|
var statusCode = getStatusCodeForError(err);
|
|
43
16
|
if (statusCode === 403) {
|
|
44
17
|
return res.status(statusCode).json(err);
|
|
45
18
|
}
|
|
46
|
-
var response =
|
|
19
|
+
var response = formatValidationErrorResponse(err);
|
|
47
20
|
if (response) {
|
|
48
21
|
switch (err.logLevel) {
|
|
49
|
-
case
|
|
22
|
+
case LogLevel.info:
|
|
50
23
|
logger.info(formatErrorForLogging(req, err));
|
|
51
24
|
break;
|
|
52
|
-
case
|
|
25
|
+
case LogLevel.warn:
|
|
53
26
|
logger.warn(formatErrorForLogging(req, err));
|
|
54
27
|
break;
|
|
55
|
-
case
|
|
28
|
+
case LogLevel.error:
|
|
56
29
|
logger.error(formatErrorForLogging(req, err));
|
|
57
30
|
break;
|
|
58
31
|
default:
|
|
@@ -68,17 +41,15 @@ var expressHttpErrorHandler = function (options) { return function (err, req, re
|
|
|
68
41
|
res.status(500).json('Unhandled error');
|
|
69
42
|
}
|
|
70
43
|
}; };
|
|
71
|
-
|
|
72
|
-
function formatErrorForLogging(req, error, prefix) {
|
|
44
|
+
export function formatErrorForLogging(req, error, prefix) {
|
|
73
45
|
if (prefix === void 0) { prefix = ''; }
|
|
74
|
-
var errorToString =
|
|
46
|
+
var errorToString = mapErrorToString(error);
|
|
75
47
|
var language = req.headers['accept-language'];
|
|
76
48
|
var userToString = JSON.stringify(formatUser(req.user));
|
|
77
49
|
var subdomain = (req.subdomains || []).join('.');
|
|
78
50
|
return "".concat(prefix, "URL: \"").concat(subdomain, " [").concat(req.method, "] ").concat(req.url, "\"; LANGUAGE: \"").concat(language, "\"; CURRENT_USER: \"").concat(userToString, "\"; ERROR: \"").concat(errorToString, "\";");
|
|
79
51
|
}
|
|
80
|
-
|
|
81
|
-
function formatUser(user) {
|
|
52
|
+
export function formatUser(user) {
|
|
82
53
|
if (user === void 0) { user = {}; }
|
|
83
54
|
if (user && user.id) {
|
|
84
55
|
var baseUser = {
|
|
@@ -93,8 +64,7 @@ function formatUser(user) {
|
|
|
93
64
|
}
|
|
94
65
|
return null;
|
|
95
66
|
}
|
|
96
|
-
|
|
97
|
-
function formatPartner(partner) {
|
|
67
|
+
export function formatPartner(partner) {
|
|
98
68
|
if (partner === void 0) { partner = {}; }
|
|
99
69
|
if (partner) {
|
|
100
70
|
return {
|
|
@@ -105,5 +75,4 @@ function formatPartner(partner) {
|
|
|
105
75
|
}
|
|
106
76
|
return null;
|
|
107
77
|
}
|
|
108
|
-
exports.formatPartner = formatPartner;
|
|
109
78
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
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; } });
|
|
1
|
+
export { languageMiddleware } from './languageMiddleware';
|
|
2
|
+
export { aliveMiddleware } from './aliveMiddleware';
|
|
3
|
+
export { partnerMiddleware } from './partnerMiddleware';
|
|
4
|
+
export { companyMiddleware } from './companyMiddleware';
|
|
5
|
+
export { translationsMiddleware } from './translationsMiddleware';
|
|
6
|
+
export { responseHelpersMiddleware } from './responseHelpersMiddleware';
|
|
7
|
+
export { expressErrorHandlerMiddleware, expressHttpErrorHandler } from './expressErrorHandlerMiddleware';
|
|
19
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/express/middleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/express/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA"}
|
|
@@ -1,36 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
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");
|
|
1
|
+
import * as cookieService from '../../../services/cookieService/cookieService';
|
|
2
|
+
import * as languageService from '../../../services/languageService/languageService';
|
|
3
|
+
import { LANGUAGES, ALL_LANGUAGES } from './../../../helpers/constants';
|
|
30
4
|
function getRequestLanguage(params) {
|
|
31
5
|
if (params === void 0) { params = {}; }
|
|
32
6
|
var req = params.req, _a = params.useCookies, useCookies = _a === void 0 ? false : _a;
|
|
33
|
-
var allLanguages =
|
|
7
|
+
var allLanguages = ALL_LANGUAGES || [];
|
|
34
8
|
var acceptedLanguage = req.acceptsLanguages.apply(req, allLanguages);
|
|
35
9
|
var cookieLanguage = useCookies ? cookieService.getCookie({ req: req, name: 'accept-language' }) : undefined;
|
|
36
10
|
return {
|
|
@@ -38,9 +12,9 @@ function getRequestLanguage(params) {
|
|
|
38
12
|
acceptedLanguage: acceptedLanguage,
|
|
39
13
|
};
|
|
40
14
|
}
|
|
41
|
-
function languageMiddleware(params) {
|
|
15
|
+
export function languageMiddleware(params) {
|
|
42
16
|
if (params === void 0) { params = {}; }
|
|
43
|
-
var _a = params.defaultLanguage, defaultLanguage = _a === void 0 ?
|
|
17
|
+
var _a = params.defaultLanguage, defaultLanguage = _a === void 0 ? LANGUAGES.EN_US : _a, _b = params.useCookies, useCookies = _b === void 0 ? false : _b;
|
|
44
18
|
return function (req, res, next) {
|
|
45
19
|
var languages = getRequestLanguage({ req: req, useCookies: useCookies });
|
|
46
20
|
var currentLanguage = languages.cookieLanguage || languages.acceptedLanguage || defaultLanguage;
|
|
@@ -53,13 +27,13 @@ function languageMiddleware(params) {
|
|
|
53
27
|
});
|
|
54
28
|
}
|
|
55
29
|
/* eslint no-param-reassign: 0 */
|
|
56
|
-
req.getAllLanguages = function () { return
|
|
30
|
+
req.getAllLanguages = function () { return ALL_LANGUAGES; };
|
|
57
31
|
/* eslint no-param-reassign: 0 */
|
|
58
32
|
req.getLanguage = function () { return currentLanguage; };
|
|
59
33
|
/* eslint no-param-reassign: 0 */
|
|
60
34
|
req.setLanguage = function (_a) {
|
|
61
35
|
var _b = _a === void 0 ? {} : _a, _c = _b.language, language = _c === void 0 ? '' : _c;
|
|
62
|
-
if (
|
|
36
|
+
if (ALL_LANGUAGES.includes(language)) {
|
|
63
37
|
currentLanguage = language;
|
|
64
38
|
if (useCookies) {
|
|
65
39
|
languageService.setCurrentLanguage({
|
|
@@ -73,5 +47,4 @@ function languageMiddleware(params) {
|
|
|
73
47
|
return next();
|
|
74
48
|
};
|
|
75
49
|
}
|
|
76
|
-
exports.languageMiddleware = languageMiddleware;
|
|
77
50
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/languageMiddleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/languageMiddleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,+CAA+C,CAAA;AAC9E,OAAO,KAAK,eAAe,MAAM,mDAAmD,CAAA;AACpF,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;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,aAAa,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,MAAM,UAAU,kBAAkB,CAAC,MAAsC;IAAtC,uBAAA,EAAA,WAAsC;IAC/D,IAAA,KAA0D,MAAM,gBAA/B,EAAjC,eAAe,mBAAG,SAAS,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,aAAa,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,aAAa,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"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.partnerMiddleware = void 0;
|
|
4
|
-
var partner_1 = require("./partner");
|
|
5
|
-
var partnerMiddleware = function (_a) {
|
|
1
|
+
import { getPartner, DEFAULT_TTL } from './partner';
|
|
2
|
+
export var partnerMiddleware = function (_a) {
|
|
6
3
|
var _b = _a === void 0 ? {} : _a, _c = _b.getPartnerFunction, getPartnerFunction = _c === void 0 ? null : _c, // (subdomain) => Promise.resolve(),
|
|
7
4
|
_d = _b.getPartnerUrl, // (subdomain) => Promise.resolve(),
|
|
8
5
|
getPartnerUrl = _d === void 0 ? null : _d, // (subdomain) => '',
|
|
9
6
|
_e = _b.cacheTtl, // (subdomain) => '',
|
|
10
|
-
cacheTtl = _e === void 0 ?
|
|
7
|
+
cacheTtl = _e === void 0 ? DEFAULT_TTL : _e, // seconds
|
|
11
8
|
_f = _b.options, // seconds
|
|
12
9
|
_g = _f === void 0 ? {} : _f, _h = _g.subdomainExtraParts, subdomainExtraParts = _h === void 0 ? [] : _h;
|
|
13
10
|
return function (req, _res, next) {
|
|
14
11
|
req.currentPartner = null; // eslint-disable-line no-param-reassign
|
|
15
12
|
var subdomain = getPartnerSubdomainName(req, subdomainExtraParts);
|
|
16
|
-
|
|
13
|
+
getPartner({ subdomain: subdomain, getPartnerUrl: getPartnerUrl, getPartnerFunction: getPartnerFunction, cacheTtl: cacheTtl })
|
|
17
14
|
.then(function (partner) {
|
|
18
15
|
req.currentPartner = partner; // eslint-disable-line no-param-reassign
|
|
19
16
|
return next();
|
|
@@ -24,7 +21,6 @@ var partnerMiddleware = function (_a) {
|
|
|
24
21
|
});
|
|
25
22
|
};
|
|
26
23
|
};
|
|
27
|
-
exports.partnerMiddleware = partnerMiddleware;
|
|
28
24
|
function getPartnerSubdomainName(req, subdomainExtraParts) {
|
|
29
25
|
return req.subdomains.filter(function (part) { return !subdomainExtraParts.includes(part); }).join('');
|
|
30
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/partnerMiddleware/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/partnerMiddleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAWnD,MAAM,CAAC,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,WAAW,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,UAAU,CAAC,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;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"}
|