@bearei/server-common 0.0.196 → 0.0.198
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/dist/access/access.guard.js +4 -4
- package/dist/access/access.guard.js.map +1 -1
- package/dist/access/access.interceptor.js +7 -7
- package/dist/access/access.interceptor.js.map +1 -1
- package/dist/base-service/base-service.interface.d.ts +1 -1
- package/dist/base-service/base-service.service.d.ts +1 -1
- package/dist/base-service/base-service.service.js +17 -20
- package/dist/base-service/base-service.service.js.map +1 -1
- package/dist/external/external.interface.d.ts +11 -0
- package/dist/external/external.service.js +7 -7
- package/dist/external/external.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/create-sanitize-response-entity.utils.d.ts +1 -0
- package/dist/utils/{response.utils.js → create-sanitize-response-entity.utils.js} +4 -4
- package/dist/utils/create-sanitize-response-entity.utils.js.map +1 -0
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/sign.utils.d.ts +1 -1
- package/dist/utils/sign.utils.js +5 -5
- package/dist/utils/sign.utils.js.map +1 -1
- package/package.json +1 -1
- package/dist/utils/response.utils.d.ts +0 -1
- package/dist/utils/response.utils.js.map +0 -1
|
@@ -42,8 +42,8 @@ let AccessGuard = class AccessGuard {
|
|
|
42
42
|
message: 'Authentication token is not found.'
|
|
43
43
|
})(exception_1.HTTP_EXCEPTION.UNAUTHORIZED);
|
|
44
44
|
}
|
|
45
|
-
const
|
|
46
|
-
const
|
|
45
|
+
const validateJWTPayload = (request) => {
|
|
46
|
+
const validateInternalSignature = (request) => (value) => {
|
|
47
47
|
if (!value) {
|
|
48
48
|
(0, exception_1.throwHTTPException)({
|
|
49
49
|
code: exception_1.HTTP_EXCEPTION_CODE.INTERNAL_SERVICE_SIGNATURE_VERIFICATION_FAILED,
|
|
@@ -59,7 +59,7 @@ let AccessGuard = class AccessGuard {
|
|
|
59
59
|
accessKey: this.configService.get('service.accessKey'),
|
|
60
60
|
secretKey: this.configService.get('service.secretKey'),
|
|
61
61
|
serviceName: this.configService.get('service.name')
|
|
62
|
-
})(subject).then(
|
|
62
|
+
})(subject).then(validateInternalSignature(request));
|
|
63
63
|
}
|
|
64
64
|
const isDisabledGuestAccess = subject === access_enum_1.ACCESS.GUEST && !requiredAccesses.includes(access_enum_1.ACCESS.GUEST);
|
|
65
65
|
if (isDisabledGuestAccess) {
|
|
@@ -74,7 +74,7 @@ let AccessGuard = class AccessGuard {
|
|
|
74
74
|
return Boolean(subject);
|
|
75
75
|
};
|
|
76
76
|
};
|
|
77
|
-
return this.jwtService.verifyAsync(token).then(
|
|
77
|
+
return this.jwtService.verifyAsync(token).then(validateJWTPayload(request)(requiredAccesses));
|
|
78
78
|
}
|
|
79
79
|
};
|
|
80
80
|
exports.AccessGuard = AccessGuard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyC;AACzC,2CAA4C;AAC5C,uCAAsC;AACtC,8CAA6C;AAC7C,4CAAoF;AAGpF,gCAAiC;AACjC,oCAAiD;AACjD,+CAAoC;AAI7B,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEL;IACA;IACA;IAHlB,YACkB,aAA4B,EAC5B,UAAsB,EACtB,SAAoB;QAFpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACpC,MAAM,gBAAgB,GAAa,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,4BAAe,EAAE;YACpF,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACpB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,aAAa,GAClB,OAAO,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,eAAe,CAAA;QAEzF,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAA;QAEjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,IAAA,8BAAkB,EAAC;gBAClB,IAAI,EAAE,+BAAmB,CAAC,kBAAkB;gBAC5C,OAAO,EAAE,oCAAoC;aAC7C,CAAC,CAAC,0BAAc,CAAC,YAAY,CAAC,CAAA;QAChC,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ let AccessInterceptor = class AccessInterceptor {
|
|
|
24
24
|
intercept(context, next) {
|
|
25
25
|
const requiredOmitEntityKeys = this.reflector.getAllAndOverride(decorators_1.OMIT_ENTITY_KEYS, [context.getClass(), context.getHandler()]);
|
|
26
26
|
const request = context.switchToHttp().getRequest();
|
|
27
|
-
const
|
|
28
|
-
const
|
|
27
|
+
const sanitizeResponse = () => next.handle().pipe((0, rxjs_1.map)(data => {
|
|
28
|
+
const sanitizeResponseEntity = (0, utils_1.createSanitizeResponseEntity)([
|
|
29
29
|
...(requiredOmitEntityKeys ?? []),
|
|
30
30
|
'deletedAt',
|
|
31
31
|
'entityStatus',
|
|
@@ -33,20 +33,20 @@ let AccessInterceptor = class AccessInterceptor {
|
|
|
33
33
|
'version'
|
|
34
34
|
]);
|
|
35
35
|
if (Array.isArray(data)) {
|
|
36
|
-
return data.map(
|
|
36
|
+
return data.map(sanitizeResponseEntity);
|
|
37
37
|
}
|
|
38
38
|
if (data && Array.isArray(data.results)) {
|
|
39
39
|
return {
|
|
40
40
|
...data,
|
|
41
|
-
results: data.results.map(
|
|
41
|
+
results: data.results.map(sanitizeResponseEntity)
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
return typeof data === 'object' && data != null ?
|
|
45
|
-
|
|
45
|
+
sanitizeResponseEntity(data)
|
|
46
46
|
: data;
|
|
47
47
|
}));
|
|
48
48
|
if (request.isInternalAccess) {
|
|
49
|
-
return
|
|
49
|
+
return sanitizeResponse();
|
|
50
50
|
}
|
|
51
51
|
const isInvalidRequestHeader = [
|
|
52
52
|
request.headers['x-ei-client'],
|
|
@@ -65,7 +65,7 @@ let AccessInterceptor = class AccessInterceptor {
|
|
|
65
65
|
request.headers['x-ei-domain-id'] = request.issuer;
|
|
66
66
|
request.headers['x-ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
|
|
67
67
|
request.headers['x-ei-subject'] = request.subject;
|
|
68
|
-
return
|
|
68
|
+
return sanitizeResponse();
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
71
|
exports.AccessInterceptor = AccessInterceptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyC;AACzC,uCAAsC;AACtC,+BAAwB;AACxB,8CAA8C;AAC9C,4CAAoF;AAEpF,
|
|
1
|
+
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyC;AACzC,uCAAsC;AACtC,+BAAwB;AACxB,8CAA8C;AAC9C,4CAAoF;AAEpF,oCAAqD;AAG9C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACA;IAA7B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACrD,MAAM,sBAAsB,GAAyB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACpF,6BAAgB,EAChB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAC1C,CAAA;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAC7B,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACjB,IAAA,UAAG,EAAC,IAAI,CAAC,EAAE;YACV,MAAM,sBAAsB,GAAG,IAAA,oCAA4B,EAAC;gBAC3D,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC;gBACjC,WAAW;gBACX,cAAc;gBACd,WAAW;gBACX,SAAS;aACT,CAAC,CAAA;YAEF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;YACxC,CAAC;YAED,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzC,OAAO;oBACN,GAAG,IAAI;oBACP,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;iBACjD,CAAA;YACF,CAAC;YAED,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC;gBAC/C,sBAAsB,CAAC,IAAI,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAA;QACR,CAAC,CAAC,CACF,CAAA;QAEF,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC9B,OAAO,gBAAgB,EAAE,CAAA;QAC1B,CAAC;QAED,MAAM,sBAAsB,GAAG;YAC9B,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACjC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;SACpC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEf,IAAI,sBAAsB,EAAE,CAAC;YAC5B,IAAA,8BAAkB,EAAC;gBAClB,IAAI,EAAE,+BAAmB,CAAC,gCAAgC;gBAC1D,OAAO,EAAE,mCAAmC;aAC5C,CAAC,CAAC,0BAAc,CAAC,WAAW,CAAC,CAAA;QAC/B,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QAClD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/F,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QAEjD,OAAO,gBAAgB,EAAE,CAAA;IAC1B,CAAC;CACD,CAAA;AAhEY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAE4B,gBAAS;GADrC,iBAAiB,CAgE7B"}
|
|
@@ -52,7 +52,7 @@ export interface PreValidateOptions<T> {
|
|
|
52
52
|
export interface ThrowExceptionOptions extends ThrowHTTPExceptionOptions {
|
|
53
53
|
httpException: HTTPException;
|
|
54
54
|
}
|
|
55
|
-
export interface
|
|
55
|
+
export interface BuildOrWhereConditionsResult<T> {
|
|
56
56
|
findOrOptions?: FindOptionsWhere<T>[];
|
|
57
57
|
where?: FindOptionsWhere<T>[];
|
|
58
58
|
}
|
|
@@ -24,6 +24,6 @@ export declare class BaseService {
|
|
|
24
24
|
checkProhibited<T extends CommonEntity>(actionLogOptions?: ActionLogOptions): (entity: T & {
|
|
25
25
|
protected?: boolean;
|
|
26
26
|
}) => Promise<void>;
|
|
27
|
-
|
|
27
|
+
createSuccessActionLog<T extends CommonEntity>(actionLogOptions: ActionLogOptions): (entities: T | T[]) => Promise<void>;
|
|
28
28
|
throwError({ httpException, ...restOptions }: ThrowExceptionOptions): (actionLogOptions?: ActionLogOptions) => Promise<void>;
|
|
29
29
|
}
|
|
@@ -44,7 +44,7 @@ let BaseService = class BaseService {
|
|
|
44
44
|
const entity = await (entityManager ?
|
|
45
45
|
entityManager.save(createdEntity)
|
|
46
46
|
: createdEntity.save());
|
|
47
|
-
await this.
|
|
47
|
+
await this.createSuccessActionLog(actionLogOptions)(entity);
|
|
48
48
|
return entity;
|
|
49
49
|
};
|
|
50
50
|
};
|
|
@@ -65,7 +65,7 @@ let BaseService = class BaseService {
|
|
|
65
65
|
await entity.softRemove();
|
|
66
66
|
return async (entityManager) => {
|
|
67
67
|
await (entityManager ? entityManager.save(entity) : entity.save());
|
|
68
|
-
await this.
|
|
68
|
+
await this.createSuccessActionLog({ ...actionLogOptions, raw })(entity);
|
|
69
69
|
};
|
|
70
70
|
};
|
|
71
71
|
}
|
|
@@ -78,16 +78,16 @@ let BaseService = class BaseService {
|
|
|
78
78
|
raw: { findOptions },
|
|
79
79
|
serviceName
|
|
80
80
|
};
|
|
81
|
-
const
|
|
82
|
-
const
|
|
81
|
+
const collectDefinedKeys = (accumulator, [key, value]) => typeof value !== 'undefined' ? [...accumulator, key] : accumulator;
|
|
82
|
+
const buildFindOptions = (rawPreValidateFindOptions) => (entity) => (accumulator, value) => value ?
|
|
83
83
|
{ ...accumulator, [value]: rawPreValidateFindOptions[value] ?? entity[value] }
|
|
84
84
|
: accumulator;
|
|
85
|
-
const
|
|
85
|
+
const preValidateUpdate = (preValidateOptions) => (actionLogOptions) => async ({ entity, repository }) => {
|
|
86
86
|
const { findOptions: rawPreValidateFindOptions, validateKeys = [], ...restPreValidateOptions } = preValidateOptions;
|
|
87
87
|
const preValidateKeys = [
|
|
88
88
|
...new Set([
|
|
89
89
|
...(rawPreValidateFindOptions ?
|
|
90
|
-
Object.entries(rawPreValidateFindOptions).reduce(
|
|
90
|
+
Object.entries(rawPreValidateFindOptions).reduce(collectDefinedKeys, [])
|
|
91
91
|
: []),
|
|
92
92
|
...validateKeys
|
|
93
93
|
])
|
|
@@ -95,7 +95,7 @@ let BaseService = class BaseService {
|
|
|
95
95
|
if (!preValidateKeys.length) {
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
|
-
const preValidateFindOptions = preValidateKeys.reduce(
|
|
98
|
+
const preValidateFindOptions = preValidateKeys.reduce(buildFindOptions(rawPreValidateFindOptions)(entity), {});
|
|
99
99
|
await (await this.preValidate({
|
|
100
100
|
...restPreValidateOptions,
|
|
101
101
|
actionLogOptions,
|
|
@@ -113,15 +113,12 @@ let BaseService = class BaseService {
|
|
|
113
113
|
const nextActionLogOptions = { ...actionLogOptions, raw };
|
|
114
114
|
await this.checkProhibited(nextActionLogOptions)(entity);
|
|
115
115
|
if (preValidateOptions) {
|
|
116
|
-
await
|
|
117
|
-
entity,
|
|
118
|
-
repository
|
|
119
|
-
});
|
|
116
|
+
await preValidateUpdate(preValidateOptions)(nextActionLogOptions)({ entity, repository });
|
|
120
117
|
}
|
|
121
118
|
repository.merge(entity, entityOptions);
|
|
122
119
|
return async (entityManager) => {
|
|
123
120
|
await (entityManager ? entityManager.save(entity) : entity.save());
|
|
124
|
-
await this.
|
|
121
|
+
await this.createSuccessActionLog({ ...actionLogOptions, raw })(entity);
|
|
125
122
|
return entity;
|
|
126
123
|
};
|
|
127
124
|
};
|
|
@@ -234,7 +231,7 @@ let BaseService = class BaseService {
|
|
|
234
231
|
const { size: _, ...restFindOptions } = findOptions;
|
|
235
232
|
const entityIdsSet = new Set(rawEntityIds);
|
|
236
233
|
const entityIds = [...entityIdsSet];
|
|
237
|
-
const
|
|
234
|
+
const filterResult = (entity) => !entity.deletedAt && entity.entityStatus === app_enum_1.ENTITY_STATUS.STANDARD;
|
|
238
235
|
return (associationKey) => {
|
|
239
236
|
const actionLogOptions = {
|
|
240
237
|
action: app_enum_1.ACTION.UPDATE,
|
|
@@ -289,20 +286,20 @@ let BaseService = class BaseService {
|
|
|
289
286
|
const savedEntities = await (entityManager ?
|
|
290
287
|
entityManager.save(entityActions)
|
|
291
288
|
: repository.save(entityActions));
|
|
292
|
-
await this.
|
|
293
|
-
return [...entities, ...entitiesToAdd].filter(
|
|
289
|
+
await this.createSuccessActionLog({ ...actionLogOptions, raw })(savedEntities);
|
|
290
|
+
return [...entities, ...entitiesToAdd].filter(filterResult);
|
|
294
291
|
};
|
|
295
292
|
};
|
|
296
293
|
};
|
|
297
294
|
}
|
|
298
295
|
async preValidate({ actionLogOptions, findOptions, orValidateKeysGroups, serviceName, validateMethod = 'and' }) {
|
|
299
|
-
const
|
|
296
|
+
const buildFindOptionsByKeys = ({ notId, ...restOptions }) => (keys) => keys.reduce((accumulator, value) => typeof value !== 'undefined' ?
|
|
300
297
|
{
|
|
301
298
|
...accumulator,
|
|
302
299
|
[value]: restOptions[value]
|
|
303
300
|
}
|
|
304
301
|
: accumulator, (notId ? { id: (0, typeorm_1.Not)(notId) } : {}));
|
|
305
|
-
const
|
|
302
|
+
const buildOrWhereConditions = (findOptions) => async (orValidateKeysGroups) => {
|
|
306
303
|
const { notId, ...restFindOptions } = findOptions;
|
|
307
304
|
const isInvalidOrValidateKeysGroups = orValidateKeysGroups && !orValidateKeysGroups.every(keys => Array.isArray(keys));
|
|
308
305
|
if (isInvalidOrValidateKeysGroups) {
|
|
@@ -317,7 +314,7 @@ let BaseService = class BaseService {
|
|
|
317
314
|
})(actionLogOptions);
|
|
318
315
|
}
|
|
319
316
|
const orValidateKeysGroupsSet = new Set(orValidateKeysGroups?.flat());
|
|
320
|
-
const findOrOptions = orValidateKeysGroups?.map(
|
|
317
|
+
const findOrOptions = orValidateKeysGroups?.map(buildFindOptionsByKeys(findOptions)) ?? [];
|
|
321
318
|
return {
|
|
322
319
|
where: [
|
|
323
320
|
...Object.entries(restFindOptions).reduce((accumulator, [key, value]) => !orValidateKeysGroupsSet.has(key) ?
|
|
@@ -336,7 +333,7 @@ let BaseService = class BaseService {
|
|
|
336
333
|
};
|
|
337
334
|
const { notId, ...restFindOptions } = findOptions;
|
|
338
335
|
const { where: orWhere, findOrOptions } = validateMethod === 'or' ?
|
|
339
|
-
await
|
|
336
|
+
await buildOrWhereConditions(findOptions)(orValidateKeysGroups)
|
|
340
337
|
: {};
|
|
341
338
|
const where = validateMethod === 'and' ? { ...restFindOptions, ...(notId && { id: (0, typeorm_1.Not)(notId) }) } : orWhere;
|
|
342
339
|
return async (repository) => {
|
|
@@ -366,7 +363,7 @@ let BaseService = class BaseService {
|
|
|
366
363
|
message: `The ${actionLogOptions.serviceName} prohibits all operations.`
|
|
367
364
|
})(actionLogOptions);
|
|
368
365
|
}
|
|
369
|
-
|
|
366
|
+
createSuccessActionLog(actionLogOptions) {
|
|
370
367
|
return async (entities) => this.actionLogService.success(actionLogOptions)({ entity: entities });
|
|
371
368
|
}
|
|
372
369
|
throwError({ httpException, ...restOptions }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-service.service.js","sourceRoot":"","sources":["../../src/base-service/base-service.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base-service.service.js","sourceRoot":"","sources":["../../src/base-service/base-service.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,3 +42,14 @@ export interface HTTPRequest {
|
|
|
42
42
|
subject: string;
|
|
43
43
|
subscription?: boolean;
|
|
44
44
|
}
|
|
45
|
+
export interface RequestError {
|
|
46
|
+
code?: string;
|
|
47
|
+
status?: number;
|
|
48
|
+
message?: string;
|
|
49
|
+
response?: {
|
|
50
|
+
data?: {
|
|
51
|
+
code?: string;
|
|
52
|
+
message?: string;
|
|
53
|
+
};
|
|
54
|
+
};
|
|
55
|
+
}
|
|
@@ -80,14 +80,13 @@ let ExternalService = class ExternalService {
|
|
|
80
80
|
audience: `internal:${this.configService.get('service.name')}`,
|
|
81
81
|
issuer: `${this.configService.get('service.name')}:${headers['x-ei-domain-id']}`
|
|
82
82
|
})({ expiresIn: '3m' })(subject);
|
|
83
|
-
const
|
|
83
|
+
const sanitizeParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => (Array.isArray(value) ? value.length : typeof value !== 'undefined') ?
|
|
84
84
|
{ ...accumulator, [key]: Array.isArray(value) ? value.join(',') : value }
|
|
85
85
|
: accumulator, {});
|
|
86
86
|
const url = `/${serviceName}/${version ?? this.configService.get('apiService.version') ?? 'v1'}${path}`;
|
|
87
|
-
|
|
88
|
-
.request({
|
|
87
|
+
const axiosRequestConfig = {
|
|
89
88
|
...restOptions,
|
|
90
|
-
...(params && { params:
|
|
89
|
+
...(params && { params: sanitizeParams(params) }),
|
|
91
90
|
adapter: 'fetch',
|
|
92
91
|
baseURL: baseURL ?? this.configService.get('apiService.url'),
|
|
93
92
|
headers: {
|
|
@@ -102,8 +101,8 @@ let ExternalService = class ExternalService {
|
|
|
102
101
|
method,
|
|
103
102
|
timeout: timeout ?? this.configService.get('apiService.timeout'),
|
|
104
103
|
url
|
|
105
|
-
}
|
|
106
|
-
|
|
104
|
+
};
|
|
105
|
+
const handleRequestError = (error) => {
|
|
107
106
|
const response = error.response;
|
|
108
107
|
if (error.code === 'ETIMEDOUT') {
|
|
109
108
|
(0, exception_1.throwHTTPException)({
|
|
@@ -121,7 +120,8 @@ let ExternalService = class ExternalService {
|
|
|
121
120
|
})(exception_1.HTTP_EXCEPTION.HTTP_EXCEPTION);
|
|
122
121
|
}
|
|
123
122
|
throw error;
|
|
124
|
-
}
|
|
123
|
+
};
|
|
124
|
+
return (0, rxjs_1.firstValueFrom)(this.httpService.request(axiosRequestConfig).pipe((0, rxjs_1.catchError)(handleRequestError))).then(({ data }) => data);
|
|
125
125
|
}
|
|
126
126
|
};
|
|
127
127
|
exports.ExternalService = ExternalService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AACzC,2CAAyC;AACzC,2CAA4C;AAC5C,+BAA+C;AAE/C,4CAAoF;AACpF,gCAAiC;AACjC,oCAA6B;
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|