@bearei/server-common 0.0.2 → 0.0.4
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/action-log/action-log.service.js +1 -1
- package/dist/action-log/action-log.service.js.map +1 -1
- package/dist/app.dto.d.ts +1 -2
- package/dist/app.dto.js +4 -9
- package/dist/app.dto.js.map +1 -1
- package/dist/app.entity.js +2 -10
- package/dist/app.entity.js.map +1 -1
- package/dist/authentication/access/access.guard.js +3 -3
- package/dist/authentication/access/access.guard.js.map +1 -1
- package/dist/authentication/auth/auth.interface.d.ts +1 -2
- package/dist/authentication/auth/auth.service.d.ts +4 -3
- package/dist/authentication/auth/auth.service.js +4 -4
- package/dist/authentication/auth/auth.service.js.map +1 -1
- package/dist/authentication/permission/permission.guard.js +1 -1
- package/dist/authentication/permission/permission.guard.js.map +1 -1
- package/dist/base/base.interface.d.ts +5 -7
- package/dist/base/base.service.d.ts +4 -4
- package/dist/base/base.service.js +107 -79
- package/dist/base/base.service.js.map +1 -1
- package/dist/base/index.d.ts +1 -0
- package/dist/base/index.js +1 -0
- package/dist/base/index.js.map +1 -1
- package/dist/common.d.ts +1 -0
- package/dist/common.js +36 -1
- package/dist/common.js.map +1 -1
- package/dist/external/external.interface.d.ts +11 -15
- package/dist/external/external.service.d.ts +6 -5
- package/dist/external/external.service.js +35 -37
- package/dist/external/external.service.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/util/error.util.d.ts +2 -2
- package/dist/util/error.util.js +5 -5
- package/dist/util/error.util.js.map +1 -1
- package/dist/util/format.util.d.ts +1 -1
- package/dist/util/format.util.js +1 -1
- package/dist/util/format.util.js.map +1 -1
- package/dist/util/util.interface.d.ts +1 -1
- package/package.json +2 -2
package/dist/base/index.d.ts
CHANGED
package/dist/base/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./base.interface"), exports);
|
|
17
18
|
__exportStar(require("./base.module"), exports);
|
|
18
19
|
__exportStar(require("./base.service"), exports);
|
|
19
20
|
//# sourceMappingURL=index.js.map
|
package/dist/base/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,iDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,gDAA6B;AAC7B,iDAA8B"}
|
package/dist/common.d.ts
CHANGED
package/dist/common.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ACTION = exports.ACTION_RESULT = exports.API_ERROR = exports.ORDER = exports.LANGUAGE = void 0;
|
|
3
|
+
exports.PERMISSION = exports.ACTION = exports.ACTION_RESULT = exports.API_ERROR = exports.ORDER = exports.LANGUAGE = void 0;
|
|
4
4
|
exports.LANGUAGE = ['EN_US', 'ZH_CN'];
|
|
5
5
|
exports.ORDER = ['ASC', 'DESC'];
|
|
6
6
|
exports.API_ERROR = [
|
|
@@ -13,4 +13,39 @@ exports.API_ERROR = [
|
|
|
13
13
|
];
|
|
14
14
|
exports.ACTION_RESULT = ['FAILURE', 'SUCCESS'];
|
|
15
15
|
exports.ACTION = ['CREATE', 'DELETE', 'EXPORT', 'IMPORT', 'SIGN_IN', 'SIGN_OUT', 'SIGN_UP', 'UPDATE'];
|
|
16
|
+
exports.PERMISSION = [
|
|
17
|
+
'CREATE_ACTION_LOG',
|
|
18
|
+
'CREATE_EMAIL',
|
|
19
|
+
'CREATE_PERMISSION',
|
|
20
|
+
'CREATE_PROJECT',
|
|
21
|
+
'CREATE_RESOURCE',
|
|
22
|
+
'CREATE_ROLE_GROUP',
|
|
23
|
+
'CREATE_ROLE',
|
|
24
|
+
'CREATE_USER',
|
|
25
|
+
'CREATE_VERSION_LOG',
|
|
26
|
+
'DELETE_EMAIL',
|
|
27
|
+
'DELETE_PERMISSION',
|
|
28
|
+
'DELETE_PROJECT',
|
|
29
|
+
'DELETE_RESOURCE',
|
|
30
|
+
'DELETE_ROLE_GROUP',
|
|
31
|
+
'DELETE_ROLE',
|
|
32
|
+
'DELETE_USER',
|
|
33
|
+
'DELETE_VERSION_LOG',
|
|
34
|
+
'UPDATE_EMAIL',
|
|
35
|
+
'UPDATE_PERMISSION',
|
|
36
|
+
'UPDATE_PROJECT',
|
|
37
|
+
'UPDATE_RESOURCE',
|
|
38
|
+
'UPDATE_ROLE_GROUP',
|
|
39
|
+
'UPDATE_ROLE',
|
|
40
|
+
'UPDATE_USER',
|
|
41
|
+
'UPDATE_VERSION_LOG',
|
|
42
|
+
'VIEW_ACTION_LOG',
|
|
43
|
+
'VIEW_EMAIL',
|
|
44
|
+
'VIEW_PERMISSION',
|
|
45
|
+
'VIEW_PROJECT',
|
|
46
|
+
'VIEW_RESOURCE',
|
|
47
|
+
'VIEW_ROLE_GROUP',
|
|
48
|
+
'VIEW_ROLE',
|
|
49
|
+
'VIEW_USER'
|
|
50
|
+
];
|
|
16
51
|
//# sourceMappingURL=common.js.map
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AAC7B,QAAA,KAAK,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AACvB,QAAA,SAAS,GAAG;IACrB,WAAW;IACX,gBAAgB;IAChB,uBAAuB;IACvB,WAAW;IACX,cAAc;IACd,sBAAsB;CACzB,CAAA;AAEY,QAAA,aAAa,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AACtC,QAAA,MAAM,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AAC7B,QAAA,KAAK,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AACvB,QAAA,SAAS,GAAG;IACrB,WAAW;IACX,gBAAgB;IAChB,uBAAuB;IACvB,WAAW;IACX,cAAc;IACd,sBAAsB;CACzB,CAAA;AAEY,QAAA,aAAa,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AACtC,QAAA,MAAM,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;AAC7F,QAAA,UAAU,GAAG;IACtB,mBAAmB;IACnB,cAAc;IACd,mBAAmB;IACnB,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;IACnB,aAAa;IACb,aAAa;IACb,oBAAoB;IACpB,cAAc;IACd,mBAAmB;IACnB,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;IACnB,aAAa;IACb,aAAa;IACb,oBAAoB;IACpB,cAAc;IACd,mBAAmB;IACnB,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;IACnB,aAAa;IACb,aAAa;IACb,oBAAoB;IACpB,iBAAiB;IACjB,YAAY;IACZ,iBAAiB;IACjB,cAAc;IACd,eAAe;IACf,iBAAiB;IACjB,WAAW;IACX,WAAW;CACd,CAAA"}
|
|
@@ -2,27 +2,23 @@ import { AxiosRequestConfig } from 'axios';
|
|
|
2
2
|
import { Action, ActionResult, APIHeaders } from '../app.interface';
|
|
3
3
|
import { Permission } from '../authentication';
|
|
4
4
|
export interface RequestOptions extends Omit<AxiosRequestConfig, 'headers'> {
|
|
5
|
-
path?: string;
|
|
6
5
|
headers: APIHeaders;
|
|
6
|
+
path?: string;
|
|
7
7
|
}
|
|
8
8
|
export interface ExternalServiceOptions {
|
|
9
9
|
headers: APIHeaders;
|
|
10
10
|
}
|
|
11
|
-
export interface CreateExternalActionLogOptions
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
};
|
|
11
|
+
export interface CreateExternalActionLogOptions {
|
|
12
|
+
action: Action;
|
|
13
|
+
data?: Record<string, unknown>;
|
|
14
|
+
message?: string;
|
|
15
|
+
raw?: Record<string, unknown>;
|
|
16
|
+
result: ActionResult;
|
|
17
|
+
serviceName: string;
|
|
19
18
|
}
|
|
20
|
-
export
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
keys: Permission[];
|
|
24
|
-
userId: string;
|
|
25
|
-
};
|
|
19
|
+
export interface AuthExternalPermissionOptions {
|
|
20
|
+
keys: Permission[];
|
|
21
|
+
userId: string;
|
|
26
22
|
}
|
|
27
23
|
export interface AuthenticatedToken {
|
|
28
24
|
aud: string;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { HttpService } from '@nestjs/axios';
|
|
2
2
|
import { ConfigService } from '@nestjs/config';
|
|
3
|
-
import {
|
|
3
|
+
import { APIHeaders } from '../app.interface';
|
|
4
|
+
import { AuthenticatedPermission, AuthenticatedToken, AuthExternalPermissionOptions, CreateExternalActionLogOptions, RequestOptions } from './external.interface';
|
|
4
5
|
export declare class ExternalService {
|
|
5
6
|
private readonly configService;
|
|
6
7
|
private readonly httpService;
|
|
7
8
|
constructor(configService: ConfigService, httpService: HttpService);
|
|
8
|
-
authAccess(
|
|
9
|
-
authPermission(
|
|
10
|
-
createActionLog(
|
|
11
|
-
request({ method, path,
|
|
9
|
+
authAccess(headers: APIHeaders): Promise<AuthenticatedToken>;
|
|
10
|
+
authPermission(headers: APIHeaders): (options: AuthExternalPermissionOptions) => Promise<AuthenticatedPermission>;
|
|
11
|
+
createActionLog(headers: APIHeaders): (options: CreateExternalActionLogOptions) => Promise<void>;
|
|
12
|
+
request({ method, path, ...options }: RequestOptions): Promise<any>;
|
|
12
13
|
}
|
|
@@ -21,49 +21,47 @@ let ExternalService = class ExternalService {
|
|
|
21
21
|
this.configService = configService;
|
|
22
22
|
this.httpService = httpService;
|
|
23
23
|
}
|
|
24
|
-
async authAccess(
|
|
24
|
+
async authAccess(headers) {
|
|
25
25
|
return this.request({ method: 'GET', path: '/auth/accesses', headers });
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
authPermission(headers) {
|
|
28
|
+
return async (options) => {
|
|
29
|
+
const { keys, ...args } = options;
|
|
30
|
+
return this.request({
|
|
31
|
+
headers,
|
|
32
|
+
method: 'GET',
|
|
33
|
+
params: { keys: keys.join(','), ...args },
|
|
34
|
+
path: '/auth/permissions'
|
|
35
|
+
});
|
|
36
|
+
};
|
|
35
37
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
38
|
+
createActionLog(headers) {
|
|
39
|
+
return async (options) => {
|
|
40
|
+
const { action, serviceName, ...args } = options;
|
|
41
|
+
await this.request({
|
|
42
|
+
method: 'POST',
|
|
43
|
+
path: '/action-logs',
|
|
44
|
+
data: {
|
|
45
|
+
...args,
|
|
46
|
+
action,
|
|
47
|
+
apiName: `${action}:${serviceName}`,
|
|
48
|
+
client: headers['x-client'],
|
|
49
|
+
ip: headers['x-ip'],
|
|
50
|
+
projectId: headers['x-project-id'],
|
|
51
|
+
scopeId: headers['x-scope-id'],
|
|
52
|
+
serviceName: this.configService.get('serviceName'),
|
|
53
|
+
userAgent: headers['user-agent'],
|
|
54
|
+
userId: headers['x-authorization']
|
|
55
|
+
},
|
|
56
|
+
headers
|
|
57
|
+
});
|
|
58
|
+
};
|
|
55
59
|
}
|
|
56
|
-
async request({ method = 'GET', path = '/',
|
|
60
|
+
async request({ method = 'GET', path = '/', ...options }) {
|
|
57
61
|
return (0, rxjs_1.firstValueFrom)(this.httpService
|
|
58
|
-
.request({
|
|
59
|
-
...options,
|
|
60
|
-
adapter: 'fetch',
|
|
61
|
-
headers: { ...headers, 'x-fc-invocation-type': 'Async' },
|
|
62
|
-
method,
|
|
63
|
-
url: `${this.configService.get('url')}${path}`
|
|
64
|
-
})
|
|
62
|
+
.request({ ...options, adapter: 'fetch', method, url: `${this.configService.get('url')}${path}` })
|
|
65
63
|
.pipe((0, rxjs_1.catchError)(error => {
|
|
66
|
-
error.status && (0, util_1.
|
|
64
|
+
error.status && (0, util_1.throwAPIError)({ response: error, status: error.status })(app_interface_1.APIError.HTTP_EXCEPTION);
|
|
67
65
|
throw error;
|
|
68
66
|
}))).then(res => res.data);
|
|
69
67
|
}
|
|
@@ -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;
|
|
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;AAU9B,IAAM,eAAe,GAArB,MAAM,eAAe;IACxB,YACqB,aAA4B,EAC5B,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,OAAmB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAC,CAAC,CAAA;IACzE,CAAC;IAED,cAAc,CAAC,OAAmB;QAC9B,OAAO,KAAK,EAAE,OAAsC,EAAoC,EAAE;YACtF,MAAM,EAAC,IAAI,EAAE,GAAG,IAAI,EAAC,GAAG,OAAO,CAAA;YAE/B,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAC;gBACvC,IAAI,EAAE,mBAAmB;aAC5B,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,eAAe,CAAC,OAAmB;QAC/B,OAAO,KAAK,EAAE,OAAuC,EAAE,EAAE;YACrD,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAC,GAAG,OAAO,CAAA;YAE9C,MAAM,IAAI,CAAC,OAAO,CAAC;gBACf,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE;oBACF,GAAG,IAAI;oBACP,MAAM;oBACN,OAAO,EAAE,GAAG,MAAM,IAAI,WAAW,EAAE;oBACnC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;oBAC3B,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC;oBACnB,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC;oBAClC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC;oBAC9B,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC;oBAChC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC;iBACrC;gBACD,OAAO;aACV,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,GAAG,EAAE,GAAG,OAAO,EAAiB;QAClE,OAAO,IAAA,qBAAc,EACjB,IAAI,CAAC,WAAW;aACX,OAAO,CAAC,EAAC,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,EAAC,CAAC;aAC/F,IAAI,CACD,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;YACf,KAAK,CAAC,MAAM,IAAI,IAAA,oBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC,CAAC,wBAAQ,CAAC,cAAc,CAAC,CAAA;YAE/F,MAAM,KAAK,CAAA;QACf,CAAC,CAAC,CACL,CACR,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;CACJ,CAAA;AA5DY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAG2B,sBAAa;QACf,mBAAW;GAHpC,eAAe,CA4D3B"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -21,6 +21,7 @@ __exportStar(require("./app.interface"), exports);
|
|
|
21
21
|
__exportStar(require("./authentication"), exports);
|
|
22
22
|
__exportStar(require("./base"), exports);
|
|
23
23
|
__exportStar(require("./common"), exports);
|
|
24
|
+
__exportStar(require("./external"), exports);
|
|
24
25
|
__exportStar(require("./redis"), exports);
|
|
25
26
|
__exportStar(require("./util"), exports);
|
|
26
27
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,4CAAyB;AACzB,+CAA4B;AAC5B,kDAA+B;AAC/B,mDAAgC;AAChC,yCAAsB;AACtB,2CAAwB;AACxB,0CAAuB;AACvB,yCAAsB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,4CAAyB;AACzB,+CAA4B;AAC5B,kDAA+B;AAC/B,mDAAgC;AAChC,yCAAsB;AACtB,2CAAwB;AACxB,6CAA0B;AAC1B,0CAAuB;AACvB,yCAAsB"}
|