@bearei/server-common 1.0.17 → 1.1.0
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 +2 -2
- package/dist/access/access.guard.js.map +1 -1
- package/dist/access/access.interceptor.js +9 -9
- package/dist/access/access.interceptor.js.map +1 -1
- package/dist/app.interface.d.ts +1 -1
- package/dist/exception/exception.enum.d.ts +1 -1
- package/dist/exception/exception.enum.js +1 -1
- package/dist/exception/exception.enum.js.map +1 -1
- package/dist/external/external.service.js +10 -10
- package/dist/external/external.service.js.map +1 -1
- package/dist/subscription-feature/subscription-feature.interceptor.js +2 -2
- package/dist/subscription-feature/subscription-feature.interceptor.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -40,7 +40,7 @@ let AccessGuard = class AccessGuard {
|
|
|
40
40
|
}
|
|
41
41
|
const request = context.switchToHttp().getRequest();
|
|
42
42
|
const headers = request.headers;
|
|
43
|
-
const authorization = headers['x-
|
|
43
|
+
const authorization = headers['x-bearei-internal-authorization'] ? 'x-bearei-internal-authorization' : 'authorization';
|
|
44
44
|
const token = (0, utils_1.extractBearerToken)(headers)(authorization);
|
|
45
45
|
if (!token) {
|
|
46
46
|
(0, exception_1.throwHTTPException)({
|
|
@@ -60,7 +60,7 @@ let AccessGuard = class AccessGuard {
|
|
|
60
60
|
return value;
|
|
61
61
|
};
|
|
62
62
|
return (requiredAccesses = []) => ({ sub: subject, iss: issuer, aud: audience }) => {
|
|
63
|
-
if (request.headers['x-
|
|
63
|
+
if (request.headers['x-bearei-internal-authorization']) {
|
|
64
64
|
const secret = `${this.configService.get('service.accessKey')}:${this.configService.get('service.secretKey')}`;
|
|
65
65
|
const isValid = (0, utils_1.createHmacVerifier)(secret)({
|
|
66
66
|
serviceName: this.configService.get('service.name')
|
|
@@ -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,oCAA+D;AAC/D,+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,GAAyB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,4BAAe,EAAE;YAChG,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACpB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,gBAAgB,EAAE,QAAQ,CAAC,oBAAM,CAAC,MAAM,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,gBAAgB,EAAE,QAAQ,CAAC,oBAAM,CAAC,SAAS,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEpD,IAAI,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAA;QACZ,CAAC;QAED,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,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,11 +49,11 @@ let AccessInterceptor = class AccessInterceptor {
|
|
|
49
49
|
return sanitizeResponse();
|
|
50
50
|
}
|
|
51
51
|
const isInvalidRequestHeader = [
|
|
52
|
-
request.headers['x-
|
|
53
|
-
request.headers['x-
|
|
54
|
-
request.headers['x-
|
|
55
|
-
request.headers['x-
|
|
56
|
-
request.headers['x-
|
|
52
|
+
request.headers['x-bearei-client'],
|
|
53
|
+
request.headers['x-bearei-domain-id'],
|
|
54
|
+
request.headers['x-bearei-ip'],
|
|
55
|
+
request.headers['x-bearei-subject'],
|
|
56
|
+
request.headers['x-bearei-subscription']
|
|
57
57
|
].some(Boolean);
|
|
58
58
|
if (isInvalidRequestHeader) {
|
|
59
59
|
(0, exception_1.throwHTTPException)({
|
|
@@ -61,10 +61,10 @@ let AccessInterceptor = class AccessInterceptor {
|
|
|
61
61
|
message: 'Contains invalid request headers.'
|
|
62
62
|
})(exception_1.HTTP_EXCEPTION.BAD_REQUEST);
|
|
63
63
|
}
|
|
64
|
-
request.headers['x-
|
|
65
|
-
request.headers['x-
|
|
66
|
-
request.headers['x-
|
|
67
|
-
request.headers['x-
|
|
64
|
+
request.headers['x-bearei-client'] = request.audience;
|
|
65
|
+
request.headers['x-bearei-domain-id'] = request.issuer;
|
|
66
|
+
request.headers['x-bearei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
|
|
67
|
+
request.headers['x-bearei-subject'] = request.subject;
|
|
68
68
|
return sanitizeResponse();
|
|
69
69
|
}
|
|
70
70
|
};
|
|
@@ -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,oCAAmD;AAG5C,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,oBAAoB,GAAG,IAAA,kCAA0B,EAAC;gBACvD,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,oBAAoB,CAAC,CAAA;YACtC,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,oBAAoB,CAAC;iBAC/C,CAAA;YACF,CAAC;YAED,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC;gBAC/C,oBAAoB,CAAC,IAAI,CAAC;gBAC3B,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,
|
|
1
|
+
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":"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"}
|
package/dist/app.interface.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import type { CommonEntity } from './app.entity';
|
|
3
3
|
import type { ACTION, ACTION_RESULT, ENTITY_STATUS, LANGUAGE, ORDER } from './app.enum';
|
|
4
|
-
export type CustomHeaders = Record<'x-
|
|
4
|
+
export type CustomHeaders = Record<'x-bearei-client' | 'x-bearei-domain-id' | 'x-bearei-internal-authorization' | 'x-bearei-ip' | 'x-bearei-subject' | 'x-bearei-subscription', string>;
|
|
5
5
|
export type RequestHeaders = Record<string, string> | CustomHeaders | AxiosRequestConfig['headers'];
|
|
6
6
|
export interface FindResult<T extends CommonEntity> {
|
|
7
7
|
limit: string;
|
|
@@ -10,7 +10,7 @@ export declare const HTTP_EXCEPTION: {
|
|
|
10
10
|
};
|
|
11
11
|
export declare const HTTP_EXCEPTION_CODE: {
|
|
12
12
|
readonly ACCESS_DENIED_FOR_GUEST: "401003";
|
|
13
|
-
readonly
|
|
13
|
+
readonly APPLE_IAP_TRANSACTION_UNAUTHORIZED: "401008";
|
|
14
14
|
readonly APPLE_IAP_TRANSACTION_NOT_COMPLETED: "403004";
|
|
15
15
|
readonly APPLE_IAP_TRANSACTION_VERIFICATION_FAILED: "403005";
|
|
16
16
|
readonly BAD_GATEWAY: "502000";
|
|
@@ -13,7 +13,7 @@ exports.HTTP_EXCEPTION = {
|
|
|
13
13
|
};
|
|
14
14
|
exports.HTTP_EXCEPTION_CODE = {
|
|
15
15
|
ACCESS_DENIED_FOR_GUEST: '401003',
|
|
16
|
-
|
|
16
|
+
APPLE_IAP_TRANSACTION_UNAUTHORIZED: '401008',
|
|
17
17
|
APPLE_IAP_TRANSACTION_NOT_COMPLETED: '403004',
|
|
18
18
|
APPLE_IAP_TRANSACTION_VERIFICATION_FAILED: '403005',
|
|
19
19
|
BAD_GATEWAY: '502000',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception.enum.js","sourceRoot":"","sources":["../../src/exception/exception.enum.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC7B,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,WAAW;IACtB,cAAc,EAAE,gBAAgB;IAChC,qBAAqB,EAAE,uBAAuB;IAC9C,SAAS,EAAE,WAAW;IACtB,eAAe,EAAE,iBAAiB;IAClC,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,sBAAsB;CACnC,CAAA;AAEG,QAAA,mBAAmB,GAAG;IAClC,uBAAuB,EAAE,QAAQ;IACjC,
|
|
1
|
+
{"version":3,"file":"exception.enum.js","sourceRoot":"","sources":["../../src/exception/exception.enum.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC7B,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,WAAW;IACtB,cAAc,EAAE,gBAAgB;IAChC,qBAAqB,EAAE,uBAAuB;IAC9C,SAAS,EAAE,WAAW;IACtB,eAAe,EAAE,iBAAiB;IAClC,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,sBAAsB;CACnC,CAAA;AAEG,QAAA,mBAAmB,GAAG;IAClC,uBAAuB,EAAE,QAAQ;IACjC,kCAAkC,EAAE,QAAQ;IAC5C,mCAAmC,EAAE,QAAQ;IAC7C,yCAAyC,EAAE,QAAQ;IACnD,WAAW,EAAE,QAAQ;IACrB,WAAW,EAAE,QAAQ;IACrB,gCAAgC,EAAE,QAAQ;IAC1C,kBAAkB,EAAE,QAAQ;IAC5B,oBAAoB,EAAE,QAAQ;IAC9B,uBAAuB,EAAE,QAAQ;IACjC,0BAA0B,EAAE,QAAQ;IACpC,SAAS,EAAE,QAAQ;IACnB,qBAAqB,EAAE,QAAQ;IAC/B,+BAA+B,EAAE,QAAQ;IACzC,6CAA6C,EAAE,QAAQ;IACvD,uBAAuB,EAAE,QAAQ;IACjC,sBAAsB,EAAE,QAAQ;IAChC,gCAAgC,EAAE,QAAQ;IAC1C,SAAS,EAAE,QAAQ;IACnB,cAAc,EAAE,QAAQ;IACxB,gCAAgC,EAAE,QAAQ;IAC1C,oBAAoB,EAAE,QAAQ;IAC9B,mBAAmB,EAAE,QAAQ;IAC7B,qBAAqB,EAAE,QAAQ;IAC/B,yBAAyB,EAAE,QAAQ;IACnC,eAAe,EAAE,QAAQ;IACzB,6BAA6B,EAAE,QAAQ;IACvC,6BAA6B,EAAE,QAAQ;IACvC,kBAAkB,EAAE,QAAQ;IAC5B,YAAY,EAAE,QAAQ;IACtB,oBAAoB,EAAE,QAAQ;IAC9B,gBAAgB,EAAE,QAAQ;CACjB,CAAA"}
|
|
@@ -54,12 +54,12 @@ let ExternalService = class ExternalService {
|
|
|
54
54
|
...restOptions,
|
|
55
55
|
action,
|
|
56
56
|
apiName: `${action}:${serviceName}`,
|
|
57
|
-
client: headers['x-
|
|
58
|
-
domainId: headers['x-
|
|
59
|
-
ip: headers['x-
|
|
57
|
+
client: headers['x-bearei-client'],
|
|
58
|
+
domainId: headers['x-bearei-domain-id'],
|
|
59
|
+
ip: headers['x-bearei-ip'],
|
|
60
60
|
serviceName: this.configService.get('service.name'),
|
|
61
61
|
userAgent: headers['user-agent'],
|
|
62
|
-
userId: headers['x-
|
|
62
|
+
userId: headers['x-bearei-subject']
|
|
63
63
|
},
|
|
64
64
|
headers
|
|
65
65
|
});
|
|
@@ -69,7 +69,7 @@ let ExternalService = class ExternalService {
|
|
|
69
69
|
const subject = (0, utils_1.createHmacSigner)(secret)({ serviceName });
|
|
70
70
|
const token = await this.jwtService.signAsync({
|
|
71
71
|
audience: `internal:${this.configService.get('service.name')}`,
|
|
72
|
-
issuer: `${this.configService.get('service.name')}:${headers['x-
|
|
72
|
+
issuer: `${this.configService.get('service.name')}:${headers['x-bearei-domain-id']}`
|
|
73
73
|
})({ expiresIn: '3m' })(subject);
|
|
74
74
|
const sanitizeParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => (Array.isArray(value) ? value.length : typeof value !== 'undefined') ?
|
|
75
75
|
{ ...accumulator, [key]: Array.isArray(value) ? value.join(',') : value }
|
|
@@ -82,11 +82,11 @@ let ExternalService = class ExternalService {
|
|
|
82
82
|
baseURL: baseURL ?? this.configService.get('apiService.url'),
|
|
83
83
|
headers: {
|
|
84
84
|
...(async && { 'x-fc-invocation-type': 'Async' }),
|
|
85
|
-
'x-
|
|
86
|
-
'x-
|
|
87
|
-
'x-
|
|
88
|
-
'x-
|
|
89
|
-
'x-
|
|
85
|
+
'x-bearei-client': headers['x-bearei-client'],
|
|
86
|
+
'x-bearei-domain-id': headers['x-bearei-domain-id'],
|
|
87
|
+
'x-bearei-internal-authorization': `Bearer ${token}`,
|
|
88
|
+
'x-bearei-ip': headers['x-bearei-ip'],
|
|
89
|
+
'x-bearei-subject': headers['x-bearei-subject'],
|
|
90
90
|
authorization: headers['authorization']
|
|
91
91
|
},
|
|
92
92
|
method,
|
|
@@ -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,oCAAyC;AAYlC,IAAM,eAAe,GAArB,MAAM,eAAe;IAET;IACA;IACA;IAHlB,YACkB,aAA4B,EAC5B,WAAwB,EACxB,UAAsB;QAFtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IACrC,CAAC;IAEJ,6BAA6B,CAAC,OAAuB;QACpD,OAAO,CAAC,OAAiE,EAAE,EAAE,CAC5E,KAAK,EAAE,EAAU,EAAyC,EAAE,CAC3D,IAAI,CAAC,OAAO,CAAC;YACZ,OAAO;YACP,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU,EAAE,cAAc;YAChC,WAAW,EAAE,mBAAmB;SAChC,CAAC,CAAA;IACL,CAAC;IAED,sCAAsC,CAAC,OAAuB;QAC7D,OAAO,CAAC,OAA0E,EAAE,EAAE,CACrF,KAAK,EAAE,EAAU,EAAsC,EAAE,CACxD,IAAI,CAAC,OAAO,CAAC;YACZ,OAAO;YACP,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU,EAAE,WAAW;YAC7B,WAAW,EAAE,qBAAqB;SAClC,CAAC,CAAA;IACL,CAAC;IAED,eAAe,CAAC,OAAuB;QACtC,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAiC,EAAE,EAAE,CACtF,IAAI,CAAC,OAAO,CAAC;YACZ,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,YAAY;YACzB,IAAI,EAAE;gBACL,GAAG,WAAW;gBACd,MAAM;gBACN,OAAO,EAAE,GAAG,MAAM,IAAI,WAAW,EAAE;gBACnC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,14 +42,14 @@ let SubscriptionFeatureInterceptor = class SubscriptionFeatureInterceptor {
|
|
|
42
42
|
size: 1,
|
|
43
43
|
userId: subject
|
|
44
44
|
})
|
|
45
|
-
.then(() => (request.headers['x-
|
|
45
|
+
.then(() => (request.headers['x-bearei-subscription'] = true))
|
|
46
46
|
.catch(error => {
|
|
47
47
|
const isThrowError = error.status !== common_1.HttpStatus.FORBIDDEN &&
|
|
48
48
|
error.code !== exception_1.HTTP_EXCEPTION_CODE.NOT_SUBSCRIBED;
|
|
49
49
|
if (isThrowError) {
|
|
50
50
|
throw error;
|
|
51
51
|
}
|
|
52
|
-
request.headers['x-
|
|
52
|
+
request.headers['x-bearei-subscription'] = false;
|
|
53
53
|
});
|
|
54
54
|
return next.handle();
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-feature.interceptor.js","sourceRoot":"","sources":["../../src/subscription-feature/subscription-feature.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAqD;AACrD,uCAAsC;AACtC,sDAAuD;AACvD,8CAAkE;AAClE,4CAAgD;AAKzC,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAExB;IACA;IAFlB,YACkB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAC3D,MAAM,4BAA4B,GACjC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,iDAAoC,EAAE;YACtE,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACpB,CAAC,CAAA;QAEH,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACrB,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAC,GAAG,OAAO,CAAA;QAE5D,IAAI,gBAAgB,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACrB,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB;aAC9B,kCAAkC,CAAC,OAAO,CAAC,CAAC;YAC5C,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,OAAO;SACf,CAAC;aACD,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"subscription-feature.interceptor.js","sourceRoot":"","sources":["../../src/subscription-feature/subscription-feature.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAqD;AACrD,uCAAsC;AACtC,sDAAuD;AACvD,8CAAkE;AAClE,4CAAgD;AAKzC,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAExB;IACA;IAFlB,YACkB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IACnC,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAC3D,MAAM,4BAA4B,GACjC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,iDAAoC,EAAE;YACtE,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACpB,CAAC,CAAA;QAEH,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACrB,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAC,GAAG,OAAO,CAAA;QAE5D,IAAI,gBAAgB,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACrB,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB;aAC9B,kCAAkC,CAAC,OAAO,CAAC,CAAC;YAC5C,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,OAAO;SACf,CAAC;aACD,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAC;aAC7D,KAAK,CAAC,KAAK,CAAC,EAAE;YACd,MAAM,YAAY,GACjB,KAAK,CAAC,MAAM,KAAK,mBAAU,CAAC,SAAS;gBACrC,KAAK,CAAC,IAAI,KAAK,+BAAmB,CAAC,cAAc,CAAA;YAElD,IAAI,YAAY,EAAE,CAAC;gBAClB,MAAM,KAAK,CAAA;YACZ,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,KAAK,CAAA;QACjD,CAAC,CAAC,CAAA;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACrB,CAAC;CACD,CAAA;AA9CY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;qCAG6B,sCAAqB;QACjC,gBAAS;GAH1B,8BAA8B,CA8C1C"}
|