@mondart/nestjs-common-module-core 3.2.12 → 3.2.14
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/decorators/iam-context.decorator.d.ts.map +1 -1
- package/dist/decorators/iam-context.decorator.js +21 -5
- package/dist/decorators/iam-context.decorator.js.map +1 -1
- package/dist/dto/response/iam-context.dto.d.ts +7 -0
- package/dist/dto/response/iam-context.dto.d.ts.map +1 -1
- package/dist/dto/response/iam-context.dto.js +27 -1
- package/dist/dto/response/iam-context.dto.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam-context.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/iam-context.decorator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAQvC,eAAO,MAAM,UAAU,mDAMtB,CAAC;AAYF,eAAO,MAAM,aAAa,GAAI,SAAS,GAAG,KAAG,
|
|
1
|
+
{"version":3,"file":"iam-context.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/iam-context.decorator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAQvC,eAAO,MAAM,UAAU,mDAMtB,CAAC;AAYF,eAAO,MAAM,aAAa,GAAI,SAAS,GAAG,KAAG,aA0D5C,CAAC"}
|
|
@@ -13,11 +13,7 @@ const getIamContext = (request) => {
|
|
|
13
13
|
? JSON.parse(request?.headers)
|
|
14
14
|
: request?.headers;
|
|
15
15
|
const injectedPayload = headers?.['injectedpayload'];
|
|
16
|
-
const ip = headers
|
|
17
|
-
headers?.['host'] ||
|
|
18
|
-
headers?.address ||
|
|
19
|
-
request?.socket?.remoteAddress ||
|
|
20
|
-
null;
|
|
16
|
+
const { ip, ips } = resolveIps(request, headers);
|
|
21
17
|
const requestId = headers?.['request-id'] ?? (0, crypto_1.randomUUID)();
|
|
22
18
|
const timestamp = new Date(headers?.['timestamp'] || headers?.['time'] || Date.now());
|
|
23
19
|
let isAgent = false;
|
|
@@ -49,6 +45,7 @@ const getIamContext = (request) => {
|
|
|
49
45
|
}
|
|
50
46
|
return new dto_1.IamContextDto({
|
|
51
47
|
ip,
|
|
48
|
+
ips,
|
|
52
49
|
requestId,
|
|
53
50
|
timestamp,
|
|
54
51
|
isAgent,
|
|
@@ -57,4 +54,23 @@ const getIamContext = (request) => {
|
|
|
57
54
|
});
|
|
58
55
|
};
|
|
59
56
|
exports.getIamContext = getIamContext;
|
|
57
|
+
const resolveIps = (request, headers) => {
|
|
58
|
+
const forwardedFor = String(headers?.['x-forwarded-for'] ?? '')
|
|
59
|
+
.split(',')
|
|
60
|
+
.map((value) => value.trim())
|
|
61
|
+
.filter(Boolean);
|
|
62
|
+
const cfConnectingIp = headers?.['cf-connecting-ip'];
|
|
63
|
+
const realIp = headers?.['x-real-ip'];
|
|
64
|
+
const remoteAddress = request?.socket?.remoteAddress;
|
|
65
|
+
const ip = cfConnectingIp ||
|
|
66
|
+
forwardedFor[0] ||
|
|
67
|
+
realIp ||
|
|
68
|
+
headers?.address ||
|
|
69
|
+
remoteAddress ||
|
|
70
|
+
null;
|
|
71
|
+
const ips = forwardedFor.length > 1
|
|
72
|
+
? { cfConnectingIp, forwardedFor, realIp, remoteAddress }
|
|
73
|
+
: undefined;
|
|
74
|
+
return { ip, ips };
|
|
75
|
+
};
|
|
60
76
|
//# sourceMappingURL=iam-context.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam-context.decorator.js","sourceRoot":"","sources":["../../src/decorators/iam-context.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AACxE,mCAAoC;AACpC,gCAAuC;AAQ1B,QAAA,UAAU,GAAG,IAAA,6BAAoB,EAC5C,CAAC,IAAa,EAAE,GAAqB,EAAiB,EAAE;IACtD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAEhD,OAAO,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;AAChC,CAAC,CACF,CAAC;AAYK,MAAM,aAAa,GAAG,CAAC,OAAY,EAAiB,EAAE;IAC3D,MAAM,OAAO,GACX,OAAO,OAAO,EAAE,OAAO,KAAK,QAAQ;QAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;QAC9B,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC;IAEvB,MAAM,eAAe,GAAG,OAAO,EAAE,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"iam-context.decorator.js","sourceRoot":"","sources":["../../src/decorators/iam-context.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AACxE,mCAAoC;AACpC,gCAAuC;AAQ1B,QAAA,UAAU,GAAG,IAAA,6BAAoB,EAC5C,CAAC,IAAa,EAAE,GAAqB,EAAiB,EAAE;IACtD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAEhD,OAAO,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;AAChC,CAAC,CACF,CAAC;AAYK,MAAM,aAAa,GAAG,CAAC,OAAY,EAAiB,EAAE;IAC3D,MAAM,OAAO,GACX,OAAO,OAAO,EAAE,OAAO,KAAK,QAAQ;QAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;QAC9B,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC;IAEvB,MAAM,eAAe,GAAG,OAAO,EAAE,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEjD,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,IAAA,mBAAU,GAAE,CAAC;IAC1D,MAAM,SAAS,GAAG,IAAI,IAAI,CACxB,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAC1D,CAAC;IACF,IAAI,OAAO,GAAY,KAAK,CAAC;IAC7B,IAAI,IAAsB,CAAC;IAC3B,IAAI,KAAwB,CAAC;IAE7B,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,IAAI,GAON,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAEhC,MAAM,KAAK,GAAG,OAAO,EAAE,CAAC,eAAe,CAAC,CAAC;QACzC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC5D,IAAI,GAAG;oBACL,MAAM,EAAE,IAAI,EAAE,GAAG;oBACjB,SAAS,EAAE,IAAI,EAAE,UAAU;oBAC3B,OAAO,EAAE,IAAI,EAAE,QAAQ;oBACvB,KAAK;iBACN,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC;gBAC1B,OAAO,GAAG,IAAI,CAAC;gBACf,KAAK,GAAG;oBACN,OAAO,EAAE,IAAI,EAAE,GAAG;oBAClB,QAAQ,EAAE,IAAI,EAAE,SAAS;oBACzB,gBAAgB,EAAE,IAAI,EAAE,iBAAiB;oBACzC,KAAK;iBACN,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,OAAO,EAAE,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,IAAI,mBAAa,CAAC;QACvB,EAAE;QACF,GAAG;QACH,SAAS;QACT,SAAS;QACT,OAAO;QACP,IAAI;QACJ,KAAK;KACN,CAAC,CAAC;AACL,CAAC,CAAC;AA1DW,QAAA,aAAa,iBA0DxB;AAUF,MAAM,UAAU,GAAG,CACjB,OAAY,EACZ,OAAY,EACuB,EAAE;IACrC,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;SAC5D,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC5B,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,cAAc,GAAG,OAAO,EAAE,CAAC,kBAAkB,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,aAAa,GAAG,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC;IAErD,MAAM,EAAE,GACN,cAAc;QACd,YAAY,CAAC,CAAC,CAAC;QACf,MAAM;QACN,OAAO,EAAE,OAAO;QAChB,aAAa;QACb,IAAI,CAAC;IACP,MAAM,GAAG,GACP,YAAY,CAAC,MAAM,GAAG,CAAC;QACrB,CAAC,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE;QACzD,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import { GetAgentInterface, GetUserInterface } from '../../interfaces';
|
|
2
|
+
export declare class IamContextIpsDto {
|
|
3
|
+
cfConnectingIp?: string;
|
|
4
|
+
forwardedFor?: string[];
|
|
5
|
+
realIp?: string;
|
|
6
|
+
remoteAddress?: string;
|
|
7
|
+
}
|
|
2
8
|
export declare class IamContextDto {
|
|
3
9
|
timestamp: Date;
|
|
4
10
|
requestId: string;
|
|
5
11
|
ip?: string;
|
|
12
|
+
ips?: IamContextIpsDto;
|
|
6
13
|
agentId: string;
|
|
7
14
|
user?: GetUserInterface;
|
|
8
15
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam-context.dto.d.ts","sourceRoot":"","sources":["../../../src/dto/response/iam-context.dto.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"iam-context.dto.d.ts","sourceRoot":"","sources":["../../../src/dto/response/iam-context.dto.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGvE,qBAAa,gBAAgB;IAE3B,cAAc,CAAC,EAAE,MAAM,CAAC;IAGxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAGxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAOD,qBAAa,aAAa;IAGxB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;IAIlB,EAAE,CAAC,EAAE,MAAM,CAAC;IAKZ,GAAG,CAAC,EAAE,gBAAgB,CAAC;IAIvB,OAAO,EAAE,MAAM,CAAC;IAIhB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IAIxB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAG1B,OAAO,CAAC,EAAE,OAAO,CAAC;gBAEN,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;CAYtE"}
|
|
@@ -9,13 +9,33 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.IamContextDto = void 0;
|
|
12
|
+
exports.IamContextDto = exports.IamContextIpsDto = void 0;
|
|
13
13
|
const swagger_1 = require("@nestjs/swagger");
|
|
14
14
|
const class_validator_1 = require("class-validator");
|
|
15
15
|
const crypto_1 = require("crypto");
|
|
16
|
+
class IamContextIpsDto {
|
|
17
|
+
}
|
|
18
|
+
exports.IamContextIpsDto = IamContextIpsDto;
|
|
19
|
+
__decorate([
|
|
20
|
+
(0, swagger_1.ApiResponseProperty)({ type: String }),
|
|
21
|
+
__metadata("design:type", String)
|
|
22
|
+
], IamContextIpsDto.prototype, "cfConnectingIp", void 0);
|
|
23
|
+
__decorate([
|
|
24
|
+
(0, swagger_1.ApiResponseProperty)({ type: [String] }),
|
|
25
|
+
__metadata("design:type", Array)
|
|
26
|
+
], IamContextIpsDto.prototype, "forwardedFor", void 0);
|
|
27
|
+
__decorate([
|
|
28
|
+
(0, swagger_1.ApiResponseProperty)({ type: String }),
|
|
29
|
+
__metadata("design:type", String)
|
|
30
|
+
], IamContextIpsDto.prototype, "realIp", void 0);
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, swagger_1.ApiResponseProperty)({ type: String }),
|
|
33
|
+
__metadata("design:type", String)
|
|
34
|
+
], IamContextIpsDto.prototype, "remoteAddress", void 0);
|
|
16
35
|
class IamContextDto {
|
|
17
36
|
constructor(init) {
|
|
18
37
|
this.ip = init?.ip;
|
|
38
|
+
this.ips = init?.ips;
|
|
19
39
|
this.isAgent = init?.isAgent;
|
|
20
40
|
this.agentId = init?.agent ? init?.agent?.agentId : undefined;
|
|
21
41
|
this.agent = init?.agent;
|
|
@@ -41,6 +61,12 @@ __decorate([
|
|
|
41
61
|
(0, class_validator_1.IsString)(),
|
|
42
62
|
__metadata("design:type", String)
|
|
43
63
|
], IamContextDto.prototype, "ip", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, swagger_1.ApiResponseProperty)({ type: IamContextIpsDto }),
|
|
66
|
+
(0, class_validator_1.IsOptional)(),
|
|
67
|
+
(0, class_validator_1.IsObject)(),
|
|
68
|
+
__metadata("design:type", IamContextIpsDto)
|
|
69
|
+
], IamContextDto.prototype, "ips", void 0);
|
|
44
70
|
__decorate([
|
|
45
71
|
(0, swagger_1.ApiResponseProperty)({ type: String }),
|
|
46
72
|
(0, class_validator_1.IsString)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam-context.dto.js","sourceRoot":"","sources":["../../../src/dto/response/iam-context.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"iam-context.dto.js","sourceRoot":"","sources":["../../../src/dto/response/iam-context.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,qDAAyE;AACzE,mCAAoC;AAIpC,MAAa,gBAAgB;CAY5B;AAZD,4CAYC;AAVC;IADC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wDACd;AAGxB;IADC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;;sDAChB;AAGxB;IADC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;gDACtB;AAGhB;IADC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uDACf;AAQzB,MAAa,aAAa;IAqCxB,YAAY,IAAyD;QACnE,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9D,IAAI,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1D,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC;QAEvB,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,IAAA,mBAAU,GAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;AAjDD,sCAiDC;AA9CC;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACnC,IAAA,wBAAM,GAAE;8BACE,IAAI;gDAAC;AAIhB;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;gDACO;AAIlB;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;yCACC;AAKZ;IAHC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;IAC/C,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;8BACL,gBAAgB;0CAAC;AAIvB;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;8CACK;AAIhB;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;2CACa;AAIxB;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;6CACI;AAIf;IAFC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrC,IAAA,0BAAQ,GAAE;;4CACe;AAG1B;IADC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;8CACrB"}
|