@bearei/server-common 0.0.67 → 0.0.69
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 +1 -5
- package/dist/access/access.guard.js.map +1 -1
- package/dist/external/external.interface.d.ts +1 -0
- package/dist/external/external.service.d.ts +1 -1
- package/dist/external/external.service.js +4 -11
- package/dist/external/external.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -25,17 +25,13 @@ let AccessGuard = class AccessGuard {
|
|
|
25
25
|
this.reflector = reflector;
|
|
26
26
|
}
|
|
27
27
|
canActivate(context) {
|
|
28
|
-
const accesses = [access_interface_1.Access.GUEST, access_interface_1.Access.USER];
|
|
29
28
|
const requiredAccesses = this.reflector.getAllAndOverride(app_decorator_1.IS_PUBLIC_KEY, [
|
|
30
29
|
context.getClass(),
|
|
31
30
|
context.getHandler()
|
|
32
31
|
]);
|
|
33
32
|
const request = context.switchToHttp().getRequest();
|
|
34
33
|
const headers = request.headers;
|
|
35
|
-
const publicAccesses = [
|
|
36
|
-
headers['ei-internal-service'],
|
|
37
|
-
requiredAccesses?.length && requiredAccesses.every(access => accesses.includes(access))
|
|
38
|
-
].some(Boolean);
|
|
34
|
+
const publicAccesses = [headers['ei-internal-service']].some(Boolean);
|
|
39
35
|
if (publicAccesses) {
|
|
40
36
|
return true;
|
|
41
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,oDAA8C;AAC9C,oDAAyC;AACzC,sDAAuD;AAEvD,kCAAkD;AAClD,yDAAyC;AAGlC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IAFrB,YACqB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IACtC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,oDAA8C;AAC9C,oDAAyC;AACzC,sDAAuD;AAEvD,kCAAkD;AAClD,yDAAyC;AAGlC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IAFrB,YACqB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IACtC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACjC,MAAM,gBAAgB,GAAa,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,6BAAa,EAAE;YAC/E,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACvB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAc,CAAA;QAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAErE,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAA;QAElC,CAAC,KAAK,IAAI,IAAA,oBAAa,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qCAAqC,EAAC,CAAC,CAAC,wBAAQ,CAAC,YAAY,CAAC,CAAA;QAEhH,OAAO,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC3E,OAAO,CAAC,GAAG,KAAK,OAAO;gBACnB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,yBAAM,CAAC,KAAK,CAAC;gBACzC,IAAA,oBAAa,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mDAAmD,EAAC,CAAC,CACzF,wBAAQ,CAAC,YAAY,CACxB,CAAA;YAEL,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,GAAG,CAAA;YAC/B,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,CAAA;YAEhC,OAAO,IAAI,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AArCY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGmC,sCAAqB;QACjC,gBAAS;GAHhC,WAAW,CAqCvB"}
|
|
@@ -2,6 +2,7 @@ import { AxiosRequestConfig } from 'axios';
|
|
|
2
2
|
import { Action, ActionResult, APIHeaders } from '../app.interface';
|
|
3
3
|
import { Permission } from '../permission';
|
|
4
4
|
export interface RequestOptions extends Omit<AxiosRequestConfig, 'headers'> {
|
|
5
|
+
async?: boolean;
|
|
5
6
|
headers: APIHeaders;
|
|
6
7
|
path?: string;
|
|
7
8
|
serviceName: string;
|
|
@@ -9,5 +9,5 @@ export declare class ExternalService {
|
|
|
9
9
|
authenticationUserAccess(headers: APIHeaders): Promise<AuthenticatedToken>;
|
|
10
10
|
authenticationUserPermission(headers: APIHeaders): (options: AuthenticationExternalPermissionOptions) => Promise<any>;
|
|
11
11
|
createActionLog(headers: APIHeaders): ({ action, serviceName, ...args }: CreateExternalActionLogOptions) => Promise<void>;
|
|
12
|
-
request({ baseURL, headers, method, params, path, serviceName, timeout, version, ...options }: RequestOptions): Promise<any>;
|
|
12
|
+
request({ baseURL, headers, method, params, path, serviceName, timeout, version, async, ...options }: RequestOptions): Promise<any>;
|
|
13
13
|
}
|
|
@@ -40,6 +40,7 @@ let ExternalService = class ExternalService {
|
|
|
40
40
|
createActionLog(headers) {
|
|
41
41
|
return async ({ action, serviceName, ...args }) => {
|
|
42
42
|
await this.request({
|
|
43
|
+
async: process.env.NODE_ENV !== 'local',
|
|
43
44
|
method: 'POST',
|
|
44
45
|
path: '/action-logs',
|
|
45
46
|
serviceName: 'bearei-logs',
|
|
@@ -55,14 +56,11 @@ let ExternalService = class ExternalService {
|
|
|
55
56
|
userAgent: headers['user-agent'],
|
|
56
57
|
userId: headers['ei-authorization']
|
|
57
58
|
},
|
|
58
|
-
headers
|
|
59
|
-
...headers,
|
|
60
|
-
...(process.env.NODE_ENV !== 'local' && { 'x-fc-invocation-type': 'Async' })
|
|
61
|
-
}
|
|
59
|
+
headers
|
|
62
60
|
});
|
|
63
61
|
};
|
|
64
62
|
}
|
|
65
|
-
async request({ baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, ...options }) {
|
|
63
|
+
async request({ baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, async = false, ...options }) {
|
|
66
64
|
const processParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => {
|
|
67
65
|
;
|
|
68
66
|
(Array.isArray(value) ? value.length : typeof value !== 'undefined') &&
|
|
@@ -75,6 +73,7 @@ let ExternalService = class ExternalService {
|
|
|
75
73
|
adapter: 'fetch',
|
|
76
74
|
baseURL: baseURL ?? this.configService.get('apiService.url'),
|
|
77
75
|
headers: {
|
|
76
|
+
...(async && { 'x-fc-invocation-type': 'Async' }),
|
|
78
77
|
'ei-authorization': headers['ei-authorization'],
|
|
79
78
|
'ei-client': headers['ei-client'],
|
|
80
79
|
'ei-internal-service': headers['ei-internal-service'] ?? this.configService.get('serviceName'),
|
|
@@ -90,12 +89,6 @@ let ExternalService = class ExternalService {
|
|
|
90
89
|
.pipe((0, rxjs_1.catchError)(error => {
|
|
91
90
|
error.code === 'ETIMEDOUT' &&
|
|
92
91
|
(0, util_1.throwAPIError)({ code: '4080001', message: 'Internal service request timeout' })(app_interface_1.APIError.REQUEST_TIMEOUT);
|
|
93
|
-
error.status &&
|
|
94
|
-
(0, util_1.throwAPIError)({
|
|
95
|
-
error,
|
|
96
|
-
status: error.status,
|
|
97
|
-
code: !isNaN(Number(error.code)) ? error.code : `${error.status}000`
|
|
98
|
-
})(app_interface_1.APIError.HTTP_EXCEPTION);
|
|
99
92
|
throw error;
|
|
100
93
|
}))).then(({ data }) => data);
|
|
101
94
|
}
|
|
@@ -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;AAC/C,oDAAqD;AACrD,kCAAqC;AAS9B,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IAFrB,YACqB,aAA4B,EAC5B,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAAC,OAAmB;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,8BAA8B,EAAE,WAAW,EAAE,cAAc,EAAC,CAAC,CAAA;IACpH,CAAC;IAED,4BAA4B,CAAC,OAAmB;QAC5C,OAAO,KAAK,EAAE,OAAgD,EAAE,EAAE;YAC9D,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,mCAAmC;gBACzC,WAAW,EAAE,cAAc;aAC9B,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,eAAe,CAAC,OAAmB;QAC/B,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAiC,EAAE,EAAE;YAC5E,MAAM,IAAI,CAAC,OAAO,CAAC;gBACf,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,aAAa;gBAC1B,IAAI,EAAE;oBACF,GAAG,IAAI;oBACP,MAAM;oBACN,OAAO,EAAE,GAAG,MAAM,IAAI,WAAW,EAAE;oBACnC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC5B,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC;oBACjC,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC;oBACpB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC;oBACnC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC;oBAChC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC;iBACtC;gBACD,OAAO
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|