@open-rlb/nestjs-amqp 2.0.10 → 2.0.12
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/common/errors.d.ts +2 -1
- package/common/errors.js +2 -1
- package/common/errors.js.map +1 -1
- package/modules/broker/const.d.ts +1 -0
- package/modules/broker/const.js +2 -1
- package/modules/broker/const.js.map +1 -1
- package/modules/broker/decorators/broker-action.decorator.d.ts +1 -1
- package/modules/broker/decorators/broker-action.decorator.js.map +1 -1
- package/modules/gateway-admin/repository/http-path.repository.d.ts +1 -0
- package/modules/gateway-admin/repository/http-path.repository.js.map +1 -1
- package/modules/gateway-admin/services/gateway-auth.service.d.ts +4 -2
- package/modules/gateway-admin/services/gateway-auth.service.js +18 -4
- package/modules/gateway-admin/services/gateway-auth.service.js.map +1 -1
- package/modules/gateway-admin/services/gateway-path.service.d.ts +4 -1
- package/modules/gateway-admin/services/gateway-path.service.js +22 -8
- package/modules/gateway-admin/services/gateway-path.service.js.map +1 -1
- package/modules/gateway-admin/services/route-sync.service.js +4 -0
- package/modules/gateway-admin/services/route-sync.service.js.map +1 -1
- package/modules/gateway-admin/util/route-diff.js +7 -3
- package/modules/gateway-admin/util/route-diff.js.map +1 -1
- package/modules/gateway-admin/util/route-manifest.d.ts +2 -0
- package/modules/gateway-admin/util/route-manifest.js +14 -0
- package/modules/gateway-admin/util/route-manifest.js.map +1 -1
- package/modules/proxy/config/path-definition.config.d.ts +2 -1
- package/modules/proxy/index.d.ts +1 -0
- package/modules/proxy/index.js +1 -0
- package/modules/proxy/index.js.map +1 -1
- package/modules/proxy/proxy.module.js +3 -2
- package/modules/proxy/proxy.module.js.map +1 -1
- package/modules/proxy/services/auth-provider-registry.service.d.ts +17 -0
- package/modules/proxy/services/auth-provider-registry.service.js +67 -0
- package/modules/proxy/services/auth-provider-registry.service.js.map +1 -0
- package/modules/proxy/services/http-auth-handler.service.d.ts +3 -2
- package/modules/proxy/services/http-auth-handler.service.js +8 -8
- package/modules/proxy/services/http-auth-handler.service.js.map +1 -1
- package/modules/proxy/services/http-handler.service.d.ts +3 -1
- package/modules/proxy/services/http-handler.service.js +21 -9
- package/modules/proxy/services/http-handler.service.js.map +1 -1
- package/modules/proxy/services/jwt.service.d.ts +2 -0
- package/modules/proxy/services/jwt.service.js +25 -12
- package/modules/proxy/services/jwt.service.js.map +1 -1
- package/package.json +1 -1
- package/schematics/nest-add/files/skills/rlb-amqp-gateway-admin/SKILL.md +41 -12
- package/schematics/nest-add/index.js +17 -6
- package/schematics/nest-add/index.js.map +1 -1
- package/schematics/nest-add/index.ts +14 -6
package/common/errors.d.ts
CHANGED
package/common/errors.js
CHANGED
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InvalidParamsErrror = exports.ConflictError = exports.NotFoundError = exports.ForbiddenError = exports.UnauthorizedError = exports.BadRequestError = exports.BrokerHttpError = void 0;
|
|
4
4
|
class BrokerHttpError extends Error {
|
|
5
|
-
constructor(message) {
|
|
5
|
+
constructor(message, details) {
|
|
6
6
|
super(message);
|
|
7
7
|
this.name = new.target.name;
|
|
8
|
+
this.details = details;
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
exports.BrokerHttpError = BrokerHttpError;
|
package/common/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../libs/rlb-nestjs-amqp/src/common/errors.ts"],"names":[],"mappings":";;;AAKA,MAAa,eAAgB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../libs/rlb-nestjs-amqp/src/common/errors.ts"],"names":[],"mappings":";;;AAKA,MAAa,eAAgB,SAAQ,KAAK;IAIxC,YAAY,OAAgB,EAAE,OAAiB;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AATD,0CASC;AAED,MAAa,eAAgB,SAAQ,eAAe;CAAI;AAAxD,0CAAwD;AACxD,MAAa,iBAAkB,SAAQ,eAAe;CAAI;AAA1D,8CAA0D;AAC1D,MAAa,cAAe,SAAQ,eAAe;CAAI;AAAvD,wCAAuD;AACvD,MAAa,aAAc,SAAQ,eAAe;CAAI;AAAtD,sCAAsD;AACtD,MAAa,aAAc,SAAQ,eAAe;CAAI;AAAtD,sCAAsD;AAEtD,MAAa,mBAAoB,SAAQ,eAAe;CAAI;AAA5D,kDAA4D"}
|
|
@@ -8,6 +8,7 @@ export declare const RLB_BROKER_HTTP_METADATA_KEY = "rlb-broker:http";
|
|
|
8
8
|
export declare const RLB_BROKER_AUTH_METADATA_KEY = "rlb-broker:auth";
|
|
9
9
|
export declare const RLB_BROKER_PARAM_METADATA_KEY = "rlb-broker:param";
|
|
10
10
|
export declare const GW_RELOAD_ACTION = "gw-reload";
|
|
11
|
+
export declare const GW_AUTH_RELOAD_ACTION = "gw-auth-reload";
|
|
11
12
|
export declare const RLB_ROUTE_DISCOVERY_OPTIONS = "RLB_ROUTE_DISCOVERY_OPTIONS";
|
|
12
13
|
export declare const ROUTE_DISCOVERY_EXCHANGE = "rlb-route-discovery";
|
|
13
14
|
export declare const ROUTE_SYNC_QUEUE = "rlb-route-sync";
|
package/modules/broker/const.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ROUTE_SYNC_QUEUE = exports.ROUTE_DISCOVERY_EXCHANGE = exports.RLB_ROUTE_DISCOVERY_OPTIONS = exports.GW_RELOAD_ACTION = exports.RLB_BROKER_PARAM_METADATA_KEY = exports.RLB_BROKER_AUTH_METADATA_KEY = exports.RLB_BROKER_HTTP_METADATA_KEY = exports.RLB_BROKER_METHOD_METADATA_KEY = exports.RLB_AMQP_GATEWAY_OPTIONS = exports.RLB_AMQP_AUTH_OPTIONS = exports.RLB_AMQP_APP_OPTIONS = exports.RLB_AMQP_TOPIC_CONNECTION = exports.RLB_AMQP_BROKER_OPTIONS = void 0;
|
|
3
|
+
exports.ROUTE_SYNC_QUEUE = exports.ROUTE_DISCOVERY_EXCHANGE = exports.RLB_ROUTE_DISCOVERY_OPTIONS = exports.GW_AUTH_RELOAD_ACTION = exports.GW_RELOAD_ACTION = exports.RLB_BROKER_PARAM_METADATA_KEY = exports.RLB_BROKER_AUTH_METADATA_KEY = exports.RLB_BROKER_HTTP_METADATA_KEY = exports.RLB_BROKER_METHOD_METADATA_KEY = exports.RLB_AMQP_GATEWAY_OPTIONS = exports.RLB_AMQP_AUTH_OPTIONS = exports.RLB_AMQP_APP_OPTIONS = exports.RLB_AMQP_TOPIC_CONNECTION = exports.RLB_AMQP_BROKER_OPTIONS = void 0;
|
|
4
4
|
exports.RLB_AMQP_BROKER_OPTIONS = 'RLB_AMQP_BROKER_OPTIONS';
|
|
5
5
|
exports.RLB_AMQP_TOPIC_CONNECTION = 'RLB_AMQP_TOPIC_CONNECTION';
|
|
6
6
|
exports.RLB_AMQP_APP_OPTIONS = 'RLB_AMQP_APP_OPTIONS';
|
|
@@ -11,6 +11,7 @@ exports.RLB_BROKER_HTTP_METADATA_KEY = 'rlb-broker:http';
|
|
|
11
11
|
exports.RLB_BROKER_AUTH_METADATA_KEY = 'rlb-broker:auth';
|
|
12
12
|
exports.RLB_BROKER_PARAM_METADATA_KEY = 'rlb-broker:param';
|
|
13
13
|
exports.GW_RELOAD_ACTION = 'gw-reload';
|
|
14
|
+
exports.GW_AUTH_RELOAD_ACTION = 'gw-auth-reload';
|
|
14
15
|
exports.RLB_ROUTE_DISCOVERY_OPTIONS = 'RLB_ROUTE_DISCOVERY_OPTIONS';
|
|
15
16
|
exports.ROUTE_DISCOVERY_EXCHANGE = 'rlb-route-discovery';
|
|
16
17
|
exports.ROUTE_SYNC_QUEUE = 'rlb-route-sync';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/const.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,yBAAyB,CAAC;AACpD,QAAA,yBAAyB,GAAG,2BAA2B,CAAC;AACxD,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,qBAAqB,GAAG,uBAAuB,CAAC;AAChD,QAAA,wBAAwB,GAAG,0BAA0B,CAAC;AACtD,QAAA,8BAA8B,GAAG,mBAAmB,CAAC;AACrD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,6BAA6B,GAAG,kBAAkB,CAAC;AAKnD,QAAA,gBAAgB,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/const.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,yBAAyB,CAAC;AACpD,QAAA,yBAAyB,GAAG,2BAA2B,CAAC;AACxD,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,qBAAqB,GAAG,uBAAuB,CAAC;AAChD,QAAA,wBAAwB,GAAG,0BAA0B,CAAC;AACtD,QAAA,8BAA8B,GAAG,mBAAmB,CAAC;AACrD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,6BAA6B,GAAG,kBAAkB,CAAC;AAKnD,QAAA,gBAAgB,GAAG,WAAW,CAAC;AAI/B,QAAA,qBAAqB,GAAG,gBAAgB,CAAC;AAGzC,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAE5D,QAAA,wBAAwB,GAAG,qBAAqB,CAAC;AAEjD,QAAA,gBAAgB,GAAG,gBAAgB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { PipeTransform } from "@nestjs/common";
|
|
|
2
2
|
export type BrokerParamSource = 'body' | 'body-full' | 'header' | 'tag' | 'action' | 'topic';
|
|
3
3
|
export type BrokerActionType = 'rpc' | 'event';
|
|
4
4
|
export type BrokerHttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
|
5
|
-
export type BrokerHttpDataSource = 'query' | 'body' | 'params';
|
|
5
|
+
export type BrokerHttpDataSource = 'query' | 'body' | 'params' | 'body-query' | 'query-body';
|
|
6
6
|
export declare function BrokerAction(topic: string, action: string, type?: BrokerActionType): MethodDecorator;
|
|
7
7
|
export declare function BrokerHTTP(method: BrokerHttpMethod, path: string, dataSource: BrokerHttpDataSource, options?: {
|
|
8
8
|
action?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broker-action.decorator.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/broker/decorators/broker-action.decorator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"broker-action.decorator.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/broker/decorators/broker-action.decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export type StoredHttpPath = Partial<PathDefinition> & {
|
|
|
7
7
|
routeKey?: string;
|
|
8
8
|
source?: 'microservice' | 'user';
|
|
9
9
|
modified?: boolean;
|
|
10
|
+
userOverrides?: string[];
|
|
10
11
|
};
|
|
11
12
|
export declare abstract class HttpPathRepository {
|
|
12
13
|
abstract insert(model: StoredHttpPath): Promise<StoredHttpPath>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-path.repository.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/repository/http-path.repository.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"http-path.repository.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/repository/http-path.repository.ts"],"names":[],"mappings":";;;AAyBA,MAAsB,kBAAkB;IActC,WAAW,CAAC,KAAa;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChC,CAAC;IAID,cAAc,CAAC,QAAgB;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnC,CAAC;CACF;AAvBD,gDAuBC"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { PaginationModel } from '../../../common';
|
|
2
2
|
import { HandlerAuthConfig } from '../../broker/config/handler-auth.config';
|
|
3
3
|
import { AuthProviderRepository, StoredAuthProvider } from '../repository/auth-provider.repository';
|
|
4
|
+
import { HttpPathRepository } from '../repository/http-path.repository';
|
|
4
5
|
export declare class GatewayAuthService {
|
|
5
6
|
private readonly repo;
|
|
7
|
+
private readonly paths;
|
|
6
8
|
private readonly logger;
|
|
7
|
-
constructor(repo: AuthProviderRepository);
|
|
9
|
+
constructor(repo: AuthProviderRepository, paths: HttpPathRepository);
|
|
8
10
|
upsert(name: string, model: StoredAuthProvider): Promise<StoredAuthProvider>;
|
|
9
|
-
remove(name: string): Promise<StoredAuthProvider>;
|
|
11
|
+
remove(name: string, force?: boolean | string): Promise<StoredAuthProvider>;
|
|
10
12
|
get(name: string): Promise<StoredAuthProvider>;
|
|
11
13
|
list(page?: number, limit?: number): Promise<PaginationModel<StoredAuthProvider>>;
|
|
12
14
|
search(q?: string, page?: number, limit?: number): Promise<PaginationModel<StoredAuthProvider>>;
|
|
@@ -19,9 +19,11 @@ const common_2 = require("../../../common");
|
|
|
19
19
|
const broker_1 = require("../../broker");
|
|
20
20
|
const const_1 = require("../const");
|
|
21
21
|
const auth_provider_repository_1 = require("../repository/auth-provider.repository");
|
|
22
|
+
const http_path_repository_1 = require("../repository/http-path.repository");
|
|
22
23
|
let GatewayAuthService = GatewayAuthService_1 = class GatewayAuthService {
|
|
23
|
-
constructor(repo) {
|
|
24
|
+
constructor(repo, paths) {
|
|
24
25
|
this.repo = repo;
|
|
26
|
+
this.paths = paths;
|
|
25
27
|
this.logger = new common_1.Logger(GatewayAuthService_1.name);
|
|
26
28
|
}
|
|
27
29
|
async upsert(name, model) {
|
|
@@ -31,9 +33,19 @@ let GatewayAuthService = GatewayAuthService_1 = class GatewayAuthService {
|
|
|
31
33
|
throw new common_2.BadRequestError('type is required');
|
|
32
34
|
return this.repo.upsertByName(name, model);
|
|
33
35
|
}
|
|
34
|
-
async remove(name) {
|
|
36
|
+
async remove(name, force) {
|
|
35
37
|
if (!name)
|
|
36
38
|
throw new common_2.BadRequestError('name is required');
|
|
39
|
+
const routes = await this.paths.filter({ auth: name });
|
|
40
|
+
if (routes.length) {
|
|
41
|
+
if (force !== true && force !== 'true') {
|
|
42
|
+
throw new common_2.ConflictError(`Auth provider '${name}' is referenced by ${routes.length} route(s); pass force=true to delete it and clear 'auth' on them.`, { routes: routes.map((r) => ({ routeKey: r.routeKey, method: r.method, path: r.path, name: r.name })) });
|
|
43
|
+
}
|
|
44
|
+
for (const r of routes) {
|
|
45
|
+
if (r._id)
|
|
46
|
+
await this.paths.updateById(r._id, { auth: null });
|
|
47
|
+
}
|
|
48
|
+
}
|
|
37
49
|
return this.repo.removeByName(name);
|
|
38
50
|
}
|
|
39
51
|
async get(name) {
|
|
@@ -63,8 +75,9 @@ __decorate([
|
|
|
63
75
|
__decorate([
|
|
64
76
|
(0, broker_1.BrokerAction)(const_1.GATEWAY_ADMIN_TOPIC, const_1.GW_ADMIN_ACTIONS.authDelete, 'rpc'),
|
|
65
77
|
__param(0, (0, broker_1.BrokerParam)('body', 'name')),
|
|
78
|
+
__param(1, (0, broker_1.BrokerParam)('body', 'force')),
|
|
66
79
|
__metadata("design:type", Function),
|
|
67
|
-
__metadata("design:paramtypes", [String]),
|
|
80
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
68
81
|
__metadata("design:returntype", Promise)
|
|
69
82
|
], GatewayAuthService.prototype, "remove", null);
|
|
70
83
|
__decorate([
|
|
@@ -99,6 +112,7 @@ __decorate([
|
|
|
99
112
|
], GatewayAuthService.prototype, "export", null);
|
|
100
113
|
exports.GatewayAuthService = GatewayAuthService = GatewayAuthService_1 = __decorate([
|
|
101
114
|
(0, common_1.Injectable)(),
|
|
102
|
-
__metadata("design:paramtypes", [auth_provider_repository_1.AuthProviderRepository
|
|
115
|
+
__metadata("design:paramtypes", [auth_provider_repository_1.AuthProviderRepository,
|
|
116
|
+
http_path_repository_1.HttpPathRepository])
|
|
103
117
|
], GatewayAuthService);
|
|
104
118
|
//# sourceMappingURL=gateway-auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-auth.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/gateway-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"gateway-auth.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/gateway-auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,10 @@ export declare class GatewayPathService {
|
|
|
9
9
|
private readonly logger;
|
|
10
10
|
constructor(repo: HttpPathRepository, logs: RouteSyncLogRepository);
|
|
11
11
|
create(model: StoredHttpPath, currentUser?: string): Promise<StoredHttpPath>;
|
|
12
|
-
update(
|
|
12
|
+
update(body: StoredHttpPath & {
|
|
13
|
+
id?: string;
|
|
14
|
+
releaseOverrides?: string[] | string;
|
|
15
|
+
}, currentUser?: string): Promise<StoredHttpPath>;
|
|
13
16
|
private assertNoRouteConflict;
|
|
14
17
|
remove(id: string, currentUser?: string): Promise<StoredHttpPath>;
|
|
15
18
|
get(id: string): Promise<StoredHttpPath>;
|
|
@@ -45,21 +45,36 @@ let GatewayPathService = GatewayPathService_1 = class GatewayPathService {
|
|
|
45
45
|
this.logger.log(`[gw-path] ${actor} created '${routeKey}'`);
|
|
46
46
|
return created;
|
|
47
47
|
}
|
|
48
|
-
async update(
|
|
48
|
+
async update(body, currentUser) {
|
|
49
|
+
const { id, _id, releaseOverrides, ...rest } = (body || {});
|
|
49
50
|
if (!id)
|
|
50
51
|
throw new common_2.BadRequestError('id is required');
|
|
52
|
+
let model = rest;
|
|
51
53
|
const existing = await this.repo.findById(id);
|
|
52
54
|
if (model?.method && model?.path) {
|
|
53
55
|
const routeKey = (0, route_manifest_1.routeKeyOf)(model);
|
|
54
56
|
await this.assertNoRouteConflict(routeKey, id);
|
|
55
57
|
model = { ...model, routeKey };
|
|
56
58
|
}
|
|
57
|
-
const
|
|
58
|
-
const
|
|
59
|
+
const contentChanges = existing ? (0, route_manifest_1.diffRouteFields)(existing, { ...existing, ...model }) : [];
|
|
60
|
+
const enabledChanged = !!existing && model?.enabled !== undefined && (model.enabled !== false) !== (existing.enabled !== false);
|
|
61
|
+
const changes = enabledChanged
|
|
62
|
+
? [...contentChanges, { field: 'enabled', added: [model.enabled !== false], removed: [existing.enabled !== false] }]
|
|
63
|
+
: contentChanges;
|
|
64
|
+
const changedFields = changes.map((c) => c.field);
|
|
65
|
+
const changedHard = changedFields.filter((f) => !route_manifest_1.USER_OVERRIDABLE_FIELDS.includes(f));
|
|
66
|
+
const changedSoft = changedFields.filter((f) => route_manifest_1.USER_OVERRIDABLE_FIELDS.includes(f));
|
|
67
|
+
const released = Array.isArray(releaseOverrides) ? releaseOverrides : releaseOverrides ? [releaseOverrides] : [];
|
|
68
|
+
const overrides = new Set([...(existing?.userOverrides || []), ...changedSoft]);
|
|
69
|
+
for (const f of released)
|
|
70
|
+
overrides.delete(f);
|
|
71
|
+
const userOverrides = [...overrides];
|
|
72
|
+
const modified = changedHard.length > 0 ? true : !!existing?.modified;
|
|
73
|
+
const updated = await this.repo.updateById(id, { ...model, modified, userOverrides });
|
|
59
74
|
const actor = currentUser ?? 'unknown';
|
|
60
75
|
const rendered = (0, route_manifest_1.renderChanges)(changes);
|
|
61
76
|
await this.journal({ service: updated?.owner ?? existing?.owner ?? 'manual', actor, level: 'info', event: 'updated', routeKey: updated?.routeKey ?? existing?.routeKey, method: updated?.method ?? existing?.method, path: updated?.path ?? existing?.path, changes, message: rendered });
|
|
62
|
-
this.logger.log(`[gw-path] ${actor} updated '${updated?.routeKey ?? existing?.routeKey}'${rendered ? ` → ${rendered}` : ''}`);
|
|
77
|
+
this.logger.log(`[gw-path] ${actor} updated '${updated?.routeKey ?? existing?.routeKey}'${modified ? ' [locked]' : userOverrides.length ? ` [overrides: ${userOverrides.join(',')}]` : ''}${rendered ? ` → ${rendered}` : ''}`);
|
|
63
78
|
return updated;
|
|
64
79
|
}
|
|
65
80
|
async assertNoRouteConflict(routeKey, excludeId) {
|
|
@@ -115,11 +130,10 @@ __decorate([
|
|
|
115
130
|
], GatewayPathService.prototype, "create", null);
|
|
116
131
|
__decorate([
|
|
117
132
|
(0, broker_1.BrokerAction)(const_1.GATEWAY_ADMIN_TOPIC, const_1.GW_ADMIN_ACTIONS.pathUpdate, 'rpc'),
|
|
118
|
-
__param(0, (0, broker_1.BrokerParam)('body'
|
|
119
|
-
__param(1, (0, broker_1.BrokerParam)('
|
|
120
|
-
__param(2, (0, broker_1.BrokerParam)('header', 'X-GTW-AUTH-USERID')),
|
|
133
|
+
__param(0, (0, broker_1.BrokerParam)('body-full')),
|
|
134
|
+
__param(1, (0, broker_1.BrokerParam)('header', 'X-GTW-AUTH-USERID')),
|
|
121
135
|
__metadata("design:type", Function),
|
|
122
|
-
__metadata("design:paramtypes", [
|
|
136
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
123
137
|
__metadata("design:returntype", Promise)
|
|
124
138
|
], GatewayPathService.prototype, "update", null);
|
|
125
139
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-path.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/gateway-path.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,4CAAkF;AAClF,yCAAyD;AAEzD,oCAAiE;AAEjE,6EAAwF;AACxF,uFAAiF;AACjF,mDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"gateway-path.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/gateway-path.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,4CAAkF;AAClF,yCAAyD;AAEzD,oCAAiE;AAEjE,6EAAwF;AACxF,uFAAiF;AACjF,mDAAgD;AAChD,2DAA6G;AAGtG,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAG7B,YACmB,IAAwB,EACxB,IAA4B;QAD5B,SAAI,GAAJ,IAAI,CAAoB;QACxB,SAAI,GAAJ,IAAI,CAAwB;QAJ9B,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IAK1D,CAAC;IAGC,AAAN,KAAK,CAAC,MAAM,CACgB,KAAqB,EACH,WAAoB;QAEhE,IAAI,CAAC,KAAK,EAAE,IAAI;YAAE,MAAM,IAAI,wBAAe,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE,MAAM;YAAE,MAAM,IAAI,wBAAe,CAAC,oBAAoB,CAAC,CAAC;QACpE,IAAI,CAAC,KAAK,EAAE,IAAI;YAAE,MAAM,IAAI,wBAAe,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE,KAAK;YAAE,MAAM,IAAI,wBAAe,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAA,2BAAU,EAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAG3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAChG,MAAM,KAAK,GAAG,WAAW,IAAI,SAAS,CAAC;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACvM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,KAAK,aAAa,QAAQ,GAAG,CAAC,CAAC;QAC5D,OAAO,OAAO,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACgB,IAA4E,EAC1D,WAAoB;QAIhE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAQ,CAAC;QACnE,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,wBAAe,CAAC,gBAAgB,CAAC,CAAC;QACrD,IAAI,KAAK,GAAmB,IAAI,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAG9C,IAAI,KAAK,EAAE,MAAM,IAAI,KAAK,EAAE,IAAI,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAA,2BAAU,EAAC,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC/C,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAC;QACjC,CAAC;QAID,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,gCAAe,EAAC,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,IAAI,KAAK,EAAE,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;QAChI,MAAM,OAAO,GAAG,cAAc;YAC5B,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,QAAS,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE,CAAC;YACrH,CAAC,CAAC,cAAc,CAAC;QAKnB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,wCAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACtF,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wCAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;QACxF,KAAK,MAAM,CAAC,IAAI,QAAQ;YAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAEtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,WAAW,IAAI,SAAS,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAA,8BAAa,EAAC,OAAO,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1R,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,KAAK,aAAa,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChO,OAAO,OAAO,CAAC;IACjB,CAAC;IAOO,KAAK,CAAC,qBAAqB,CAAC,QAAgB,EAAE,SAAkB;QACtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;QACzF,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,sBAAa,CAAC,YAAY,QAAQ,4BAA4B,QAAQ,CAAC,KAAK,IAAI,QAAQ,SAAS,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/H,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACiB,EAAU,EACO,WAAoB;QAEhE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,WAAW,IAAI,SAAS,CAAC;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/K,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,KAAK,aAAa,OAAO,EAAE,QAAQ,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3E,OAAO,OAAO,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAA4B,EAAU;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CAA8B,IAAa,EAAgC,KAAc;QACjG,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;IAIK,AAAN,KAAK,CAAC,YAAY,CAA2B,CAAU,EAA+B,IAAa,EAAgC,KAAc;QAC/I,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,IAAA,uBAAU,EAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAIK,AAAN,KAAK,CAAC,OAAO,CAA+B,KAAc;QACxD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;IAC9C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CACiB,KAAc,EACZ,OAAgB,EAClB,KAAc,EACX,QAAiB,EACrB,IAAa,EACf,EAAW,EACT,IAAa,EACZ,KAAc;QAE5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CACpB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAC3H,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CACvC,CAAC;IACJ,CAAC;IAGO,KAAK,CAAC,OAAO,CAAC,KAAoC;QACxD,IAAI,CAAC;YAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAAC,CAAC;QAC7D,OAAO,CAAC,EAAE,CAAC;YAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAoC,CAAW,EAAE,OAAO,EAAE,CAAC,CAAC;QAAC,CAAC;IAC7F,CAAC;CACF,CAAA;AAxJY,gDAAkB;AASvB;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC;IAEnE,WAAA,IAAA,oBAAW,EAAC,WAAW,CAAC,CAAA;IACxB,WAAA,IAAA,oBAAW,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;;;;gDAe5C;AAGK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC;IAEnE,WAAA,IAAA,oBAAW,EAAC,WAAW,CAAC,CAAA;IACxB,WAAA,IAAA,oBAAW,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;;;;gDA0C5C;AAgBK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC;IAEnE,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACzB,WAAA,IAAA,oBAAW,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;;;;gDAO5C;AAGK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC;IACxD,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;;;;6CAEnC;AAGK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC;IACxD,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAAiB,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;;;;8CAEnF;AAIK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC;IAClD,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAAc,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAAiB,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;;;;sDAEjI;AAIK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC;;;;gDAIrE;AAIK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC;IACzD,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;;;;iDAE1C;AAIK;IADL,IAAA,qBAAY,EAAC,2BAAmB,EAAE,wBAAgB,CAAC,cAAc,EAAE,KAAK,CAAC;IAEvE,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC9B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC/B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACzB,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,WAAA,IAAA,oBAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;;;;mDAM9B;6BAjJU,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAKc,yCAAkB;QAClB,kDAAsB;GALpC,kBAAkB,CAwJ9B"}
|
|
@@ -77,6 +77,10 @@ let RouteSyncService = RouteSyncService_1 = class RouteSyncService {
|
|
|
77
77
|
}
|
|
78
78
|
const diff = (0, route_diff_1.diffRoutes)(service, routes, existing, reserved);
|
|
79
79
|
for (const c of diff.collisions) {
|
|
80
|
+
if (c.conflictWith === 'yaml' || c.conflictWith === 'manual') {
|
|
81
|
+
this.logger.debug(`[route-sync] ${service}: '${c.routeKey}' already owned by '${c.conflictWith}' → skipped`);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
80
84
|
this.logger.warn(`[route-sync] ${service}: collision on '${c.routeKey}' (owned by '${c.conflictWith}') → skipped`);
|
|
81
85
|
await this.journal({ service, level: 'warn', event: 'collision', routeKey: c.routeKey, method: c.method, path: c.path, conflictWith: c.conflictWith, message: `route '${c.routeKey}' already owned by '${c.conflictWith}'; skipped` });
|
|
82
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-sync.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/route-sync.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"route-sync.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/services/route-sync.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,14 +28,18 @@ function diffRoutes(service, incoming, existing, reserved) {
|
|
|
28
28
|
diff.skipped.push({ routeKey: key, method: r.method, path: r.path });
|
|
29
29
|
continue;
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
const overrides = ex?.userOverrides || [];
|
|
32
|
+
const merged = (0, route_manifest_1.applyUserOverrides)(r, ex, overrides);
|
|
33
|
+
const exEnabled = ex ? ex.enabled !== false : true;
|
|
34
|
+
const newEnabled = overrides.includes('enabled') ? exEnabled : true;
|
|
35
|
+
if (ex && newEnabled === exEnabled && (0, route_manifest_1.routeContent)(merged) === (0, route_manifest_1.routeContent)(ex))
|
|
32
36
|
continue;
|
|
33
37
|
diff.upserts.push({
|
|
34
38
|
routeKey: key,
|
|
35
39
|
existingId: ex?._id,
|
|
36
40
|
added: !ex,
|
|
37
|
-
model: { ...
|
|
38
|
-
changes: ex ? (0, route_manifest_1.diffRouteFields)(ex,
|
|
41
|
+
model: { ...merged, owner: service, routeKey: key, enabled: newEnabled, source: 'microservice', modified: false, userOverrides: overrides },
|
|
42
|
+
changes: ex ? (0, route_manifest_1.diffRouteFields)(ex, merged) : undefined,
|
|
39
43
|
});
|
|
40
44
|
}
|
|
41
45
|
for (const [key, ex] of existingByKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-diff.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/util/route-diff.ts"],"names":[],"mappings":";;AA6BA,
|
|
1
|
+
{"version":3,"file":"route-diff.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/util/route-diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ export declare function routeKeyOf(r: {
|
|
|
3
3
|
method?: string;
|
|
4
4
|
path?: string;
|
|
5
5
|
}): string;
|
|
6
|
+
export declare const USER_OVERRIDABLE_FIELDS: string[];
|
|
7
|
+
export declare function applyUserOverrides(incoming: any, existing: any, userOverrides?: string[]): any;
|
|
6
8
|
export declare function stableStringify(value: any): string;
|
|
7
9
|
export declare function routeContent(r: any): string;
|
|
8
10
|
export declare function isValidRoute(r: any): boolean;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.USER_OVERRIDABLE_FIELDS = void 0;
|
|
3
4
|
exports.routeKeyOf = routeKeyOf;
|
|
5
|
+
exports.applyUserOverrides = applyUserOverrides;
|
|
4
6
|
exports.stableStringify = stableStringify;
|
|
5
7
|
exports.routeContent = routeContent;
|
|
6
8
|
exports.isValidRoute = isValidRoute;
|
|
@@ -20,6 +22,18 @@ function canonicalRoute(r) {
|
|
|
20
22
|
};
|
|
21
23
|
}
|
|
22
24
|
const ROUTE_FIELDS = Object.keys(canonicalRoute({}));
|
|
25
|
+
exports.USER_OVERRIDABLE_FIELDS = ['enabled', 'actions', 'allowAnonymous', 'timeout', 'redirect', 'successStatusCode'];
|
|
26
|
+
function applyUserOverrides(incoming, existing, userOverrides) {
|
|
27
|
+
if (!userOverrides?.length || !existing)
|
|
28
|
+
return incoming;
|
|
29
|
+
const merged = { ...incoming };
|
|
30
|
+
for (const f of userOverrides) {
|
|
31
|
+
if (f === 'enabled')
|
|
32
|
+
continue;
|
|
33
|
+
merged[f] = existing[f];
|
|
34
|
+
}
|
|
35
|
+
return merged;
|
|
36
|
+
}
|
|
23
37
|
function stableStringify(value) {
|
|
24
38
|
if (value === null || typeof value !== 'object')
|
|
25
39
|
return JSON.stringify(value) ?? 'null';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-manifest.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/util/route-manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-manifest.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/gateway-admin/util/route-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { BrokerHttpDataSource } from '../../broker/decorators/broker-action.decorator';
|
|
1
2
|
export interface PathDefinition {
|
|
2
3
|
name: string;
|
|
3
4
|
method: string;
|
|
@@ -6,7 +7,7 @@ export interface PathDefinition {
|
|
|
6
7
|
topic: string;
|
|
7
8
|
action: string;
|
|
8
9
|
successStatusCode?: number;
|
|
9
|
-
dataSource:
|
|
10
|
+
dataSource: BrokerHttpDataSource;
|
|
10
11
|
mode: 'event' | 'rpc';
|
|
11
12
|
auth?: string;
|
|
12
13
|
allowAnonymous?: boolean;
|
package/modules/proxy/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './config/path-definition.config';
|
|
2
2
|
export * from './proxy.module';
|
|
3
3
|
export * from './services/acl.service';
|
|
4
|
+
export * from './services/auth-provider-registry.service';
|
|
4
5
|
export * from './services/metrics-hook';
|
|
5
6
|
export interface ProcessedAuthData {
|
|
6
7
|
[key: string]: any;
|
package/modules/proxy/index.js
CHANGED
|
@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./config/path-definition.config"), exports);
|
|
18
18
|
__exportStar(require("./proxy.module"), exports);
|
|
19
19
|
__exportStar(require("./services/acl.service"), exports);
|
|
20
|
+
__exportStar(require("./services/auth-provider-registry.service"), exports);
|
|
20
21
|
__exportStar(require("./services/metrics-hook"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/proxy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kEAAgD;AAChD,iDAA+B;AAC/B,yDAAuC;AACvC,0DAAwC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/proxy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kEAAgD;AAChD,iDAA+B;AAC/B,yDAAuC;AACvC,4EAA0D;AAC1D,0DAAwC"}
|
|
@@ -12,6 +12,7 @@ const axios_1 = require("@nestjs/axios");
|
|
|
12
12
|
const common_1 = require("@nestjs/common");
|
|
13
13
|
const config_1 = require("@nestjs/config");
|
|
14
14
|
const const_1 = require("../broker/const");
|
|
15
|
+
const auth_provider_registry_service_1 = require("./services/auth-provider-registry.service");
|
|
15
16
|
const http_auth_handler_service_1 = require("./services/http-auth-handler.service");
|
|
16
17
|
const http_handler_service_1 = require("./services/http-handler.service");
|
|
17
18
|
const jwt_service_1 = require("./services/jwt.service");
|
|
@@ -50,8 +51,8 @@ exports.ProxyModule = ProxyModule = ProxyModule_1 = __decorate([
|
|
|
50
51
|
(0, common_1.Global)(),
|
|
51
52
|
(0, common_1.Module)({
|
|
52
53
|
imports: [config_1.ConfigModule, axios_1.HttpModule],
|
|
53
|
-
providers: [http_handler_service_1.HttpHandlerService, jwt_service_1.JwtService, http_auth_handler_service_1.HttpAuthHandlerService, websocket_service_1.WebSocketService],
|
|
54
|
-
exports: [http_handler_service_1.HttpHandlerService]
|
|
54
|
+
providers: [http_handler_service_1.HttpHandlerService, jwt_service_1.JwtService, http_auth_handler_service_1.HttpAuthHandlerService, auth_provider_registry_service_1.AuthProviderRegistry, websocket_service_1.WebSocketService],
|
|
55
|
+
exports: [http_handler_service_1.HttpHandlerService, auth_provider_registry_service_1.AuthProviderRegistry]
|
|
55
56
|
})
|
|
56
57
|
], ProxyModule);
|
|
57
58
|
//# sourceMappingURL=proxy.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.module.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/proxy/proxy.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yCAA2C;AAC3C,2CAA+E;AAC/E,2CAA8C;AAE9C,2CAAkF;AAElF,oFAA8E;AAC9E,0EAAqE;AACrE,wDAAoD;AACpD,oEAAgE;AAsBzD,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAMtB,MAAM,CAAC,OAAO,CAAC,UAA8B,EAAE,EAAE,YAAwB,EAAE;QACzE,MAAM,mBAAmB,GAAa,EAAE,OAAO,EAAE,6BAAqB,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;QACxG,MAAM,sBAAsB,GAAa,EAAE,OAAO,EAAE,gCAAwB,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;QACjH,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,SAAS,EAAE,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC9E,OAAO,EAAE,CAAC,yCAAkB,EAAE,mBAAmB,EAAE,sBAAsB,CAAC;SAC3E,CAAC;IACJ,CAAC;IAMD,MAAM,CAAC,YAAY,CAAC,YAAqC;QACvD,MAAM,mBAAmB,GAAa;YACpC,OAAO,EAAE,6BAAqB;YAC9B,UAAU,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;YAC1F,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;SAClC,CAAC;QACF,MAAM,sBAAsB,GAAa;YACvC,OAAO,EAAE,gCAAwB;YACjC,UAAU,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,cAAc;YAC7F,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;SAClC,CAAC;QACF,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,EAAE;YACnC,SAAS,EAAE,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC3F,OAAO,EAAE,CAAC,yCAAkB,EAAE,mBAAmB,EAAE,sBAAsB,CAAC;SAC3E,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,kCAAW;sBAAX,WAAW;IANvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAY,EAAE,kBAAU,CAAC;QACnC,SAAS,EAAE,CAAC,yCAAkB,EAAE,wBAAU,EAAE,kDAAsB,EAAE,oCAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy.module.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/proxy/proxy.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yCAA2C;AAC3C,2CAA+E;AAC/E,2CAA8C;AAE9C,2CAAkF;AAElF,8FAAiF;AACjF,oFAA8E;AAC9E,0EAAqE;AACrE,wDAAoD;AACpD,oEAAgE;AAsBzD,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAMtB,MAAM,CAAC,OAAO,CAAC,UAA8B,EAAE,EAAE,YAAwB,EAAE;QACzE,MAAM,mBAAmB,GAAa,EAAE,OAAO,EAAE,6BAAqB,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;QACxG,MAAM,sBAAsB,GAAa,EAAE,OAAO,EAAE,gCAAwB,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;QACjH,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,SAAS,EAAE,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC9E,OAAO,EAAE,CAAC,yCAAkB,EAAE,mBAAmB,EAAE,sBAAsB,CAAC;SAC3E,CAAC;IACJ,CAAC;IAMD,MAAM,CAAC,YAAY,CAAC,YAAqC;QACvD,MAAM,mBAAmB,GAAa;YACpC,OAAO,EAAE,6BAAqB;YAC9B,UAAU,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;YAC1F,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;SAClC,CAAC;QACF,MAAM,sBAAsB,GAAa;YACvC,OAAO,EAAE,gCAAwB;YACjC,UAAU,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,cAAc;YAC7F,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,EAAE;SAClC,CAAC;QACF,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,EAAE;YACnC,SAAS,EAAE,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC3F,OAAO,EAAE,CAAC,yCAAkB,EAAE,mBAAmB,EAAE,sBAAsB,CAAC;SAC3E,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,kCAAW;sBAAX,WAAW;IANvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAY,EAAE,kBAAU,CAAC;QACnC,SAAS,EAAE,CAAC,yCAAkB,EAAE,wBAAU,EAAE,kDAAsB,EAAE,qDAAoB,EAAE,oCAAgB,CAAC;QAC3G,OAAO,EAAE,CAAC,yCAAkB,EAAE,qDAAoB,CAAC;KACpD,CAAC;GACW,WAAW,CAsCvB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { HandlerAuthConfig } from '../../broker/config/handler-auth.config';
|
|
2
|
+
import { JwtService } from './jwt.service';
|
|
3
|
+
export declare const RLB_GTW_AUTH_PROVIDER_SOURCE = "RLB_GTW_AUTH_PROVIDER_SOURCE";
|
|
4
|
+
export interface IAuthProviderSource {
|
|
5
|
+
listEnabled(): Promise<HandlerAuthConfig[]>;
|
|
6
|
+
}
|
|
7
|
+
export declare class AuthProviderRegistry {
|
|
8
|
+
private readonly source;
|
|
9
|
+
private readonly jwt;
|
|
10
|
+
private readonly logger;
|
|
11
|
+
private readonly yaml;
|
|
12
|
+
private current;
|
|
13
|
+
constructor(yamlProviders: HandlerAuthConfig[] | undefined, source: IAuthProviderSource | undefined, jwt: JwtService);
|
|
14
|
+
find(name?: string): HandlerAuthConfig | undefined;
|
|
15
|
+
list(): HandlerAuthConfig[];
|
|
16
|
+
reload(): Promise<number>;
|
|
17
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
var AuthProviderRegistry_1;
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.AuthProviderRegistry = exports.RLB_GTW_AUTH_PROVIDER_SOURCE = void 0;
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
18
|
+
const const_1 = require("../../broker/const");
|
|
19
|
+
const jwt_service_1 = require("./jwt.service");
|
|
20
|
+
exports.RLB_GTW_AUTH_PROVIDER_SOURCE = 'RLB_GTW_AUTH_PROVIDER_SOURCE';
|
|
21
|
+
let AuthProviderRegistry = AuthProviderRegistry_1 = class AuthProviderRegistry {
|
|
22
|
+
constructor(yamlProviders, source, jwt) {
|
|
23
|
+
this.source = source;
|
|
24
|
+
this.jwt = jwt;
|
|
25
|
+
this.logger = new common_1.Logger(AuthProviderRegistry_1.name);
|
|
26
|
+
this.yaml = Array.isArray(yamlProviders) ? yamlProviders : [];
|
|
27
|
+
this.current = this.yaml;
|
|
28
|
+
}
|
|
29
|
+
find(name) {
|
|
30
|
+
return name ? this.current.find((p) => p?.name === name) : undefined;
|
|
31
|
+
}
|
|
32
|
+
list() {
|
|
33
|
+
return this.current;
|
|
34
|
+
}
|
|
35
|
+
async reload() {
|
|
36
|
+
let db = [];
|
|
37
|
+
if (this.source) {
|
|
38
|
+
try {
|
|
39
|
+
db = (await this.source.listEnabled()) || [];
|
|
40
|
+
}
|
|
41
|
+
catch (e) {
|
|
42
|
+
this.logger.warn(`[auth-reload] failed to read DB auth-providers: ${e?.message}. Keeping current set (${this.current.length}).`);
|
|
43
|
+
return this.current.length;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const byName = new Map();
|
|
47
|
+
for (const p of this.yaml)
|
|
48
|
+
if (p?.name)
|
|
49
|
+
byName.set(p.name, p);
|
|
50
|
+
for (const p of db)
|
|
51
|
+
if (p?.name)
|
|
52
|
+
byName.set(p.name, p);
|
|
53
|
+
this.current = [...byName.values()];
|
|
54
|
+
this.jwt.resetClients();
|
|
55
|
+
this.logger.log(`[auth-reload] providers ready: ${this.current.length} (yaml=${this.yaml.length}, db=${db.length})`);
|
|
56
|
+
return this.current.length;
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
exports.AuthProviderRegistry = AuthProviderRegistry;
|
|
60
|
+
exports.AuthProviderRegistry = AuthProviderRegistry = AuthProviderRegistry_1 = __decorate([
|
|
61
|
+
(0, common_1.Injectable)(),
|
|
62
|
+
__param(0, (0, common_1.Inject)(const_1.RLB_AMQP_AUTH_OPTIONS)),
|
|
63
|
+
__param(1, (0, common_1.Optional)()),
|
|
64
|
+
__param(1, (0, common_1.Inject)(exports.RLB_GTW_AUTH_PROVIDER_SOURCE)),
|
|
65
|
+
__metadata("design:paramtypes", [Array, Object, jwt_service_1.JwtService])
|
|
66
|
+
], AuthProviderRegistry);
|
|
67
|
+
//# sourceMappingURL=auth-provider-registry.service.js.map
|