@darraghor/nest-backend-libs 1.3.0 → 1.4.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/index.d.ts +4 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/logger/LoggingInterceptor.js +8 -3
- package/dist/logger/LoggingInterceptor.js.map +1 -1
- package/dist/person/PersonConfigurationService.d.ts +12 -0
- package/dist/person/PersonConfigurationService.js +83 -0
- package/dist/person/PersonConfigurationService.js.map +1 -0
- package/dist/person/PersonConfigurationVariables.d.ts +9 -0
- package/dist/person/PersonConfigurationVariables.js +12 -0
- package/dist/person/PersonConfigurationVariables.js.map +1 -0
- package/dist/person/entities/person.entity.js +3 -0
- package/dist/person/entities/person.entity.js.map +1 -1
- package/dist/person/person.module.js +8 -1
- package/dist/person/person.module.js.map +1 -1
- package/dist/person/person.service.d.ts +4 -1
- package/dist/person/person.service.js +25 -27
- package/dist/person/person.service.js.map +1 -1
- package/dist/root-app/core-app.module.js +0 -2
- package/dist/root-app/core-app.module.js.map +1 -1
- package/package.json +1 -1
- package/dist/root-app/httpLogResponseContent.d.ts +0 -5
- package/dist/root-app/httpLogResponseContent.js +0 -43
- package/dist/root-app/httpLogResponseContent.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -9,6 +9,9 @@ import { TypeOrmConfigurationProvider } from "./database/TypeOrmConfigurationPro
|
|
|
9
9
|
import { EmailClientModule } from "./email-client/email-client.module";
|
|
10
10
|
import { EmailClient } from "./email-client/email-client.service";
|
|
11
11
|
import CoreLoggerService from "./logger/CoreLoggerService";
|
|
12
|
+
import { OrganisationModule } from "./organisation/organisation.module";
|
|
13
|
+
import { Person } from "./person/entities/person.entity";
|
|
14
|
+
import { PersonModule } from "./person/person.module";
|
|
12
15
|
import { CoreModule } from "./root-app/core-app.module";
|
|
13
16
|
import { SwaggerGen } from "./root-app/SwaggerGen";
|
|
14
|
-
export { CoreLoggerService, CoreConfigurationService, EmailClientModule, CoreModule, SwaggerGen, DefaultAuthGuard, DatabaseModule, JwtStrategy, AuthzModule, TypeOrmConfigurationProvider, EmailClient, ValidatedConfigurationService, RequestWithUser, };
|
|
17
|
+
export { CoreLoggerService, CoreConfigurationService, EmailClientModule, CoreModule, SwaggerGen, DefaultAuthGuard, DatabaseModule, JwtStrategy, AuthzModule, Person, TypeOrmConfigurationProvider, EmailClient, ValidatedConfigurationService, RequestWithUser, PersonModule, OrganisationModule, };
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ValidatedConfigurationService = exports.EmailClient = exports.TypeOrmConfigurationProvider = exports.AuthzModule = exports.JwtStrategy = exports.DatabaseModule = exports.DefaultAuthGuard = exports.SwaggerGen = exports.CoreModule = exports.EmailClientModule = exports.CoreConfigurationService = exports.CoreLoggerService = void 0;
|
|
6
|
+
exports.OrganisationModule = exports.PersonModule = exports.ValidatedConfigurationService = exports.EmailClient = exports.TypeOrmConfigurationProvider = exports.Person = exports.AuthzModule = exports.JwtStrategy = exports.DatabaseModule = exports.DefaultAuthGuard = exports.SwaggerGen = exports.CoreModule = exports.EmailClientModule = exports.CoreConfigurationService = exports.CoreLoggerService = void 0;
|
|
7
7
|
const authz_module_1 = require("./authz/authz.module");
|
|
8
8
|
Object.defineProperty(exports, "AuthzModule", { enumerable: true, get: function () { return authz_module_1.AuthzModule; } });
|
|
9
9
|
const authzstrategy_1 = require("./authz/authzstrategy");
|
|
@@ -24,6 +24,12 @@ const email_client_service_1 = require("./email-client/email-client.service");
|
|
|
24
24
|
Object.defineProperty(exports, "EmailClient", { enumerable: true, get: function () { return email_client_service_1.EmailClient; } });
|
|
25
25
|
const CoreLoggerService_1 = __importDefault(require("./logger/CoreLoggerService"));
|
|
26
26
|
exports.CoreLoggerService = CoreLoggerService_1.default;
|
|
27
|
+
const organisation_module_1 = require("./organisation/organisation.module");
|
|
28
|
+
Object.defineProperty(exports, "OrganisationModule", { enumerable: true, get: function () { return organisation_module_1.OrganisationModule; } });
|
|
29
|
+
const person_entity_1 = require("./person/entities/person.entity");
|
|
30
|
+
Object.defineProperty(exports, "Person", { enumerable: true, get: function () { return person_entity_1.Person; } });
|
|
31
|
+
const person_module_1 = require("./person/person.module");
|
|
32
|
+
Object.defineProperty(exports, "PersonModule", { enumerable: true, get: function () { return person_module_1.PersonModule; } });
|
|
27
33
|
const core_app_module_1 = require("./root-app/core-app.module");
|
|
28
34
|
Object.defineProperty(exports, "CoreModule", { enumerable: true, get: function () { return core_app_module_1.CoreModule; } });
|
|
29
35
|
const SwaggerGen_1 = require("./root-app/SwaggerGen");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAiD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAiD;AA0B7C,4FA1BI,0BAAW,OA0BJ;AAzBf,yDAAkD;AAwB9C,4FAxBI,2BAAW,OAwBJ;AAvBf,+DAA0D;AAqBtD,iGArBI,mCAAgB,OAqBJ;AAnBpB,iGAA4F;AA0BxF,8GA1BI,6DAA6B,OA0BJ;AAzBjC,qFAAgF;AAc5E,yGAdI,mDAAwB,OAcJ;AAb5B,gEAA0D;AAkBtD,+FAlBI,gCAAc,OAkBJ;AAjBlB,0FAAqF;AAqBjF,6GArBI,2DAA4B,OAqBJ;AApBhC,4EAAqE;AAYjE,kGAZI,uCAAiB,OAYJ;AAXrB,8EAAgE;AAoB5D,4FApBI,kCAAW,OAoBJ;AAnBf,mFAA2D;AAQvD,4BARG,2BAAiB,CAQH;AAPrB,4EAAsE;AAsBlE,mGAtBI,wCAAkB,OAsBJ;AArBtB,mEAAuD;AAenD,uFAfI,sBAAM,OAeJ;AAdV,0DAAoD;AAmBhD,6FAnBI,4BAAY,OAmBJ;AAlBhB,gEAAsD;AAOlD,2FAPI,4BAAU,OAOJ;AANd,sDAAiD;AAO7C,2FAPI,uBAAU,OAOJ"}
|
|
@@ -23,9 +23,10 @@ let LoggingInterceptor = class LoggingInterceptor {
|
|
|
23
23
|
}
|
|
24
24
|
intercept(context, next) {
|
|
25
25
|
const request = context.switchToHttp().getRequest();
|
|
26
|
-
const
|
|
26
|
+
const response = context.switchToHttp().getResponse();
|
|
27
27
|
const { originalUrl, method, params, query, body } = request;
|
|
28
28
|
this.logger.log({
|
|
29
|
+
type: "REQUEST",
|
|
29
30
|
originalUrl,
|
|
30
31
|
method,
|
|
31
32
|
params,
|
|
@@ -33,8 +34,12 @@ let LoggingInterceptor = class LoggingInterceptor {
|
|
|
33
34
|
body,
|
|
34
35
|
});
|
|
35
36
|
return next.handle().pipe(rxjs_1.tap((data) => this.logger.log({
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
type: "RESPONSE",
|
|
38
|
+
originalUrl,
|
|
39
|
+
method,
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
41
|
+
status: response?.status,
|
|
42
|
+
responseBody: data || undefined,
|
|
38
43
|
})));
|
|
39
44
|
}
|
|
40
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingInterceptor.js","sourceRoot":"","sources":["../../src/logger/LoggingInterceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAA4D;AAC5D,2CAKwB;AACxB,+BAAyB;AACzB,4EAAoD;AAGpD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YAA6B,MAAyB;QAAzB,WAAM,GAAN,MAAM,CAAmB;IAAG,CAAC;IAC1D,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QAEpD,MAAM,
|
|
1
|
+
{"version":3,"file":"LoggingInterceptor.js","sourceRoot":"","sources":["../../src/logger/LoggingInterceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAA4D;AAC5D,2CAKwB;AACxB,+BAAyB;AACzB,4EAAoD;AAGpD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YAA6B,MAAyB;QAAzB,WAAM,GAAN,MAAM,CAAmB;IAAG,CAAC;IAC1D,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QAEpD,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,CAAC;QAEtD,MAAM,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,SAAS;YACf,WAAW;YACX,MAAM;YACN,MAAM;YACN,KAAK;YACL,IAAI;SACP,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACrB,UAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,MAAM;YACN,sEAAsE;YACtE,MAAM,EAAE,QAAQ,EAAE,MAAM;YACxB,YAAY,EAAE,IAAI,IAAI,SAAS;SAClC,CAAC,CACL,CACJ,CAAC;IACN,CAAC;CACJ,CAAA;AA/BY,kBAAkB;IAD9B,mBAAU,EAAE;qCAE4B,2BAAiB;GAD7C,kBAAkB,CA+B9B;AA/BY,gDAAkB"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ConfigService } from "@nestjs/config";
|
|
2
|
+
import { ValidatedConfigurationService } from "../configuration/ValidatedConfigurationService";
|
|
3
|
+
export declare class PersonConfigurationService extends ValidatedConfigurationService {
|
|
4
|
+
private configService;
|
|
5
|
+
constructor(configService: ConfigService);
|
|
6
|
+
get fakeSub(): string;
|
|
7
|
+
get fakeFamilyName(): string;
|
|
8
|
+
get fakeGivenNAme(): string;
|
|
9
|
+
get fakeName(): string;
|
|
10
|
+
get fakeEmail(): string;
|
|
11
|
+
get fakePicture(): string;
|
|
12
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.PersonConfigurationService = void 0;
|
|
13
|
+
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const config_1 = require("@nestjs/config");
|
|
16
|
+
const class_validator_1 = require("class-validator");
|
|
17
|
+
const ValidatedConfigurationService_1 = require("../configuration/ValidatedConfigurationService");
|
|
18
|
+
let PersonConfigurationService = class PersonConfigurationService extends ValidatedConfigurationService_1.ValidatedConfigurationService {
|
|
19
|
+
constructor(configService) {
|
|
20
|
+
super();
|
|
21
|
+
this.configService = configService;
|
|
22
|
+
}
|
|
23
|
+
get fakeSub() {
|
|
24
|
+
return this.configService.get("person.fakeSub");
|
|
25
|
+
}
|
|
26
|
+
get fakeFamilyName() {
|
|
27
|
+
return this.configService.get("person.fakeFamilyName");
|
|
28
|
+
}
|
|
29
|
+
get fakeGivenNAme() {
|
|
30
|
+
return this.configService.get("person.fakeGivenNAme");
|
|
31
|
+
}
|
|
32
|
+
get fakeName() {
|
|
33
|
+
return this.configService.get("person.fakeName");
|
|
34
|
+
}
|
|
35
|
+
get fakeEmail() {
|
|
36
|
+
return this.configService.get("person.fakeEmail");
|
|
37
|
+
}
|
|
38
|
+
get fakePicture() {
|
|
39
|
+
return this.configService.get("person.fakePicture");
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
__decorate([
|
|
43
|
+
class_validator_1.IsDefined(),
|
|
44
|
+
class_validator_1.IsString(),
|
|
45
|
+
__metadata("design:type", String),
|
|
46
|
+
__metadata("design:paramtypes", [])
|
|
47
|
+
], PersonConfigurationService.prototype, "fakeSub", null);
|
|
48
|
+
__decorate([
|
|
49
|
+
class_validator_1.IsDefined(),
|
|
50
|
+
class_validator_1.IsString(),
|
|
51
|
+
__metadata("design:type", String),
|
|
52
|
+
__metadata("design:paramtypes", [])
|
|
53
|
+
], PersonConfigurationService.prototype, "fakeFamilyName", null);
|
|
54
|
+
__decorate([
|
|
55
|
+
class_validator_1.IsDefined(),
|
|
56
|
+
class_validator_1.IsString(),
|
|
57
|
+
__metadata("design:type", String),
|
|
58
|
+
__metadata("design:paramtypes", [])
|
|
59
|
+
], PersonConfigurationService.prototype, "fakeGivenNAme", null);
|
|
60
|
+
__decorate([
|
|
61
|
+
class_validator_1.IsDefined(),
|
|
62
|
+
class_validator_1.IsString(),
|
|
63
|
+
__metadata("design:type", String),
|
|
64
|
+
__metadata("design:paramtypes", [])
|
|
65
|
+
], PersonConfigurationService.prototype, "fakeName", null);
|
|
66
|
+
__decorate([
|
|
67
|
+
class_validator_1.IsDefined(),
|
|
68
|
+
class_validator_1.IsString(),
|
|
69
|
+
__metadata("design:type", String),
|
|
70
|
+
__metadata("design:paramtypes", [])
|
|
71
|
+
], PersonConfigurationService.prototype, "fakeEmail", null);
|
|
72
|
+
__decorate([
|
|
73
|
+
class_validator_1.IsDefined(),
|
|
74
|
+
class_validator_1.IsString(),
|
|
75
|
+
__metadata("design:type", String),
|
|
76
|
+
__metadata("design:paramtypes", [])
|
|
77
|
+
], PersonConfigurationService.prototype, "fakePicture", null);
|
|
78
|
+
PersonConfigurationService = __decorate([
|
|
79
|
+
common_1.Injectable(),
|
|
80
|
+
__metadata("design:paramtypes", [config_1.ConfigService])
|
|
81
|
+
], PersonConfigurationService);
|
|
82
|
+
exports.PersonConfigurationService = PersonConfigurationService;
|
|
83
|
+
//# sourceMappingURL=PersonConfigurationService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PersonConfigurationService.js","sourceRoot":"","sources":["../../src/person/PersonConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA6D;AAC7D,2CAA0C;AAC1C,2CAA6C;AAC7C,qDAAoD;AACpD,kGAA6F;AAG7F,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,6DAA6B;IACzE,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAID,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,gBAAgB,CAAE,CAAC;IAC7D,CAAC;IAID,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,uBAAuB,CAAE,CAAC;IACpE,CAAC;IAGD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,sBAAsB,CAAE,CAAC;IACnE,CAAC;IAGD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,iBAAiB,CAAE,CAAC;IAC9D,CAAC;IAGD,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAE,CAAC;IAC/D,CAAC;IAGD,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;CACJ,CAAA;AA7BG;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;yDAGV;AAID;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;gEAGV;AAGD;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;+DAGV;AAGD;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;0DAGV;AAGD;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;2DAGV;AAGD;IAFC,2BAAS,EAAE;IACX,0BAAQ,EAAE;;;6DAGV;AAnCQ,0BAA0B;IADtC,mBAAU,EAAE;qCAE0B,sBAAa;GADvC,0BAA0B,CAoCtC;AApCY,gEAA0B"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
declare const _default: (() => {
|
|
2
|
+
fakeSub: string | undefined;
|
|
3
|
+
fakeFamilyName: string | undefined;
|
|
4
|
+
fakeGivenNAme: string | undefined;
|
|
5
|
+
fakeName: string | undefined;
|
|
6
|
+
fakeEmail: string | undefined;
|
|
7
|
+
fakePicture: string | undefined;
|
|
8
|
+
}) & import("@nestjs/config").ConfigFactoryKeyHost;
|
|
9
|
+
export default _default;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const config_1 = require("@nestjs/config");
|
|
4
|
+
exports.default = config_1.registerAs("person", () => ({
|
|
5
|
+
fakeSub: process.env.AUTH0_M2M_FAKE_SUB,
|
|
6
|
+
fakeFamilyName: process.env.AUTH0_M2M_FAKE_FAMILY_NAME,
|
|
7
|
+
fakeGivenNAme: process.env.AUTH0_M2M_FAKE_GIVEN_NAME,
|
|
8
|
+
fakeName: process.env.AUTH0_M2M_FAKE_NAME,
|
|
9
|
+
fakeEmail: process.env.AUTH0_M2M_FAKE_EMAIL,
|
|
10
|
+
fakePicture: process.env.AUTH0_M2M_FAKE_PICTURE,
|
|
11
|
+
}));
|
|
12
|
+
//# sourceMappingURL=PersonConfigurationVariables.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PersonConfigurationVariables.js","sourceRoot":"","sources":["../../src/person/PersonConfigurationVariables.ts"],"names":[],"mappings":";;AAAA,2CAA0C;AAE1C,kBAAe,mBAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;IACvC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IACtD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IACpD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IAC3C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;CAClD,CAAC,CAAC,CAAC"}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.Person = void 0;
|
|
13
13
|
const swagger_1 = require("@nestjs/swagger");
|
|
14
|
+
const class_transformer_1 = require("class-transformer");
|
|
14
15
|
const typeorm_1 = require("typeorm");
|
|
15
16
|
const organisation_entity_1 = require("../../organisation/entities/organisation.entity");
|
|
16
17
|
let Person = class Person {
|
|
@@ -76,6 +77,7 @@ __decorate([
|
|
|
76
77
|
__metadata("design:type", String)
|
|
77
78
|
], Person.prototype, "username", void 0);
|
|
78
79
|
__decorate([
|
|
80
|
+
class_transformer_1.Exclude(),
|
|
79
81
|
typeorm_1.ManyToMany(() => organisation_entity_1.Organisation, (org) => org.members, {
|
|
80
82
|
cascade: true,
|
|
81
83
|
onDelete: "CASCADE",
|
|
@@ -83,6 +85,7 @@ __decorate([
|
|
|
83
85
|
__metadata("design:type", Array)
|
|
84
86
|
], Person.prototype, "memberOfOrganisations", void 0);
|
|
85
87
|
__decorate([
|
|
88
|
+
class_transformer_1.Exclude(),
|
|
86
89
|
typeorm_1.OneToMany(() => organisation_entity_1.Organisation, (org) => org.owner, {
|
|
87
90
|
cascade: true,
|
|
88
91
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"person.entity.js","sourceRoot":"","sources":["../../../src/person/entities/person.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,qCAWiB;AACjB,yFAA6E;AAG7E,IAAa,MAAM,GAAnB,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"person.entity.js","sourceRoot":"","sources":["../../../src/person/entities/person.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,yDAA0C;AAC1C,qCAWiB;AACjB,yFAA6E;AAG7E,IAAa,MAAM,GAAnB,MAAa,MAAM;CA0ElB,CAAA;AAvEG;IAFC,gCAAsB,EAAE;IACxB,qBAAW,EAAE;;kCACF;AAIZ;IAFC,qBAAW,EAAE;IACb,gBAAM,EAAE;;qCACM;AAQf;IANC,gBAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,mBAAS,CAAC,MAAM,CAAC;IACjB,qBAAW,EAAE;;oCACO;AAIrB;IAFC,qBAAW,EAAE;IACb,gBAAM,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;6CACD;AAIxB;IAFC,qBAAW,EAAE;IACb,gBAAM,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;uCACP;AAIlB;IAFC,6BAAmB,EAAE;IACrB,gBAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;oCACX;AAId;IAFC,6BAAmB,EAAE;IACrB,gBAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;0CACL;AAIpB;IAFC,6BAAmB,EAAE;IACrB,gBAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;yCACN;AAInB;IAFC,qBAAW,EAAE;IACb,gBAAM,EAAE;;uCACQ;AAKjB;IAHC,qBAAW,EAAE;IACb,gBAAM,EAAE;IACR,eAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;;2CACD;AAIrB;IAFC,6BAAmB,EAAE;IACrB,gBAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;wCACP;AAOlB;IALC,2BAAO,EAAE;IACT,oBAAU,CAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE;QAClD,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,SAAS;KACtB,CAAC;;qDACqC;AAMvC;IAJC,2BAAO,EAAE;IACT,mBAAS,CAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE;QAC/C,OAAO,EAAE,IAAI;KAChB,CAAC;;oDACoC;AAItC;IAFC,0BAAgB,EAAE;IAClB,qBAAW,EAAE;8BACA,IAAI;2CAAC;AAInB;IAFC,0BAAgB,EAAE;IAClB,qBAAW,EAAE;8BACD,IAAI;0CAAC;AAIlB;IAFC,0BAAgB,EAAE;IAClB,qBAAW,EAAE;8BACA,IAAI;2CAAC;AAzEV,MAAM;IADlB,gBAAM,EAAE;GACI,MAAM,CA0ElB;AA1EY,wBAAM"}
|
|
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
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
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.PersonModule = void 0;
|
|
10
13
|
const common_1 = require("@nestjs/common");
|
|
@@ -14,17 +17,21 @@ const person_entity_1 = require("./entities/person.entity");
|
|
|
14
17
|
const logger_module_1 = require("../logger/logger.module");
|
|
15
18
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
16
19
|
const authz_client_module_1 = require("../authzclient/authz-client.module");
|
|
20
|
+
const PersonConfigurationService_1 = require("./PersonConfigurationService");
|
|
21
|
+
const config_1 = require("@nestjs/config");
|
|
22
|
+
const PersonConfigurationVariables_1 = __importDefault(require("./PersonConfigurationVariables"));
|
|
17
23
|
let PersonModule = class PersonModule {
|
|
18
24
|
};
|
|
19
25
|
PersonModule = __decorate([
|
|
20
26
|
common_1.Module({
|
|
21
27
|
imports: [
|
|
28
|
+
config_1.ConfigModule.forFeature(PersonConfigurationVariables_1.default),
|
|
22
29
|
logger_module_1.LoggerModule,
|
|
23
30
|
typeorm_1.TypeOrmModule.forFeature([person_entity_1.Person]),
|
|
24
31
|
authz_client_module_1.AuthzClientModule,
|
|
25
32
|
],
|
|
26
33
|
controllers: [person_controller_1.PersonController],
|
|
27
|
-
providers: [person_service_1.PersonService],
|
|
34
|
+
providers: [person_service_1.PersonService, PersonConfigurationService_1.PersonConfigurationService],
|
|
28
35
|
exports: [person_service_1.PersonService],
|
|
29
36
|
})
|
|
30
37
|
], PersonModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"person.module.js","sourceRoot":"","sources":["../../src/person/person.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"person.module.js","sourceRoot":"","sources":["../../src/person/person.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsC;AACtC,qDAA+C;AAC/C,2DAAqD;AACrD,4DAAgD;AAChD,2DAAqD;AACrD,6CAA8C;AAC9C,4EAAqE;AACrE,6EAAwE;AACxE,2CAA4C;AAC5C,kGAA6D;AAY7D,IAAa,YAAY,GAAzB,MAAa,YAAY;CAAG,CAAA;AAAf,YAAY;IAXxB,eAAM,CAAC;QACJ,OAAO,EAAE;YACL,qBAAY,CAAC,UAAU,CAAC,sCAAe,CAAC;YACxC,4BAAY;YACZ,uBAAa,CAAC,UAAU,CAAC,CAAC,sBAAM,CAAC,CAAC;YAClC,uCAAiB;SACpB;QACD,WAAW,EAAE,CAAC,oCAAgB,CAAC;QAC/B,SAAS,EAAE,CAAC,8BAAa,EAAE,uDAA0B,CAAC;QACtD,OAAO,EAAE,CAAC,8BAAa,CAAC;KAC3B,CAAC;GACW,YAAY,CAAG;AAAf,oCAAY"}
|
|
@@ -5,16 +5,19 @@ import { UserProfile } from "../authzclient/UserProfile.dto";
|
|
|
5
5
|
import CoreLoggerService from "../logger/CoreLoggerService";
|
|
6
6
|
import { UpdatePersonDto } from "./dto/update-person.dto";
|
|
7
7
|
import { Person } from "./entities/person.entity";
|
|
8
|
+
import { PersonConfigurationService } from "./PersonConfigurationService";
|
|
8
9
|
export declare class PersonService {
|
|
9
10
|
private repository;
|
|
10
11
|
private logger;
|
|
11
12
|
private authzClient;
|
|
12
|
-
|
|
13
|
+
private personConfig;
|
|
14
|
+
constructor(repository: Repository<Person>, logger: CoreLoggerService, authzClient: AuthZClientService, personConfig: PersonConfigurationService);
|
|
13
15
|
getAuth0User(payload: AccessToken, rawAccessToken: string): Promise<UserProfile | undefined>;
|
|
14
16
|
validateUser(payload: AccessToken, rawAccessToken: string): Promise<Person | undefined>;
|
|
15
17
|
findAll(): Promise<Person[]>;
|
|
16
18
|
findOneByAuth0Id(auth0Id: string): Promise<Person | undefined>;
|
|
17
19
|
findOne(id: number): Promise<Person>;
|
|
20
|
+
findOneByUuid(uuid: string): Promise<Person>;
|
|
18
21
|
update(uuid: string, updatePersonDto: UpdatePersonDto, currentUserUuid: string): Promise<import("typeorm").UpdateResult>;
|
|
19
22
|
remove(uuid: string, currentUserUuid: string): Promise<Person>;
|
|
20
23
|
private isOwnerGuard;
|
|
@@ -24,26 +24,29 @@ const UserProfile_dto_1 = require("../authzclient/UserProfile.dto");
|
|
|
24
24
|
const CoreLoggerService_1 = __importDefault(require("../logger/CoreLoggerService"));
|
|
25
25
|
const organisation_entity_1 = require("../organisation/entities/organisation.entity");
|
|
26
26
|
const person_entity_1 = require("./entities/person.entity");
|
|
27
|
+
const PersonConfigurationService_1 = require("./PersonConfigurationService");
|
|
27
28
|
let PersonService = class PersonService {
|
|
28
|
-
constructor(repository, logger, authzClient) {
|
|
29
|
+
constructor(repository, logger, authzClient, personConfig) {
|
|
29
30
|
this.repository = repository;
|
|
30
31
|
this.logger = logger;
|
|
31
32
|
this.authzClient = authzClient;
|
|
33
|
+
this.personConfig = personConfig;
|
|
32
34
|
}
|
|
33
35
|
async getAuth0User(payload, rawAccessToken) {
|
|
34
36
|
// fake the user for our m2m token user used in testing
|
|
35
37
|
// m2m users don't get profiles
|
|
36
|
-
if (payload.sub ===
|
|
38
|
+
if (payload.sub === this.personConfig.fakeSub) {
|
|
37
39
|
const integrationTestM2MFakeUser = new UserProfile_dto_1.UserProfile();
|
|
38
40
|
integrationTestM2MFakeUser.email_verified = true;
|
|
39
|
-
integrationTestM2MFakeUser.family_name =
|
|
41
|
+
integrationTestM2MFakeUser.family_name =
|
|
42
|
+
this.personConfig.fakeFamilyName;
|
|
40
43
|
integrationTestM2MFakeUser.gender = undefined;
|
|
41
44
|
integrationTestM2MFakeUser.sub = payload.sub;
|
|
42
|
-
integrationTestM2MFakeUser.given_name =
|
|
43
|
-
|
|
44
|
-
integrationTestM2MFakeUser.
|
|
45
|
-
integrationTestM2MFakeUser.
|
|
46
|
-
|
|
45
|
+
integrationTestM2MFakeUser.given_name =
|
|
46
|
+
this.personConfig.fakeGivenNAme;
|
|
47
|
+
integrationTestM2MFakeUser.name = this.personConfig.fakeName;
|
|
48
|
+
integrationTestM2MFakeUser.email = this.personConfig.fakeEmail;
|
|
49
|
+
integrationTestM2MFakeUser.picture = this.personConfig.fakePicture;
|
|
47
50
|
return integrationTestM2MFakeUser;
|
|
48
51
|
}
|
|
49
52
|
return await this.authzClient.getUser(rawAccessToken);
|
|
@@ -85,35 +88,29 @@ let PersonService = class PersonService {
|
|
|
85
88
|
return this.repository.find();
|
|
86
89
|
}
|
|
87
90
|
async findOneByAuth0Id(auth0Id) {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
catch (error) {
|
|
94
|
-
this.logger.error("Couldn't find a user to notify", error);
|
|
95
|
-
return undefined;
|
|
96
|
-
}
|
|
91
|
+
return this.repository.findOneOrFail({
|
|
92
|
+
auth0UserId: auth0Id,
|
|
93
|
+
});
|
|
97
94
|
}
|
|
98
95
|
async findOne(id) {
|
|
99
96
|
return this.repository.findOneOrFail(id);
|
|
100
97
|
}
|
|
98
|
+
async findOneByUuid(uuid) {
|
|
99
|
+
return this.repository.findOneOrFail({ uuid }, { relations: ["ownerOfOrganisations"] });
|
|
100
|
+
}
|
|
101
101
|
async update(uuid, updatePersonDto, currentUserUuid) {
|
|
102
102
|
this.isOwnerGuard(uuid, currentUserUuid, "update");
|
|
103
103
|
return this.repository.update({ uuid }, updatePersonDto);
|
|
104
104
|
}
|
|
105
105
|
async remove(uuid, currentUserUuid) {
|
|
106
106
|
this.isOwnerGuard(uuid, currentUserUuid, "delete");
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
catch (error) {
|
|
114
|
-
this.logger.error("Couldn't find a user to notify", error);
|
|
115
|
-
throw new common_1.NotFoundException();
|
|
107
|
+
const user = await this.repository.findOneOrFail({
|
|
108
|
+
uuid,
|
|
109
|
+
}, {});
|
|
110
|
+
if (user.ownerOfOrganisations.length > 0) {
|
|
111
|
+
throw new Error("Can't remove the owner of an organisation");
|
|
116
112
|
}
|
|
113
|
+
return this.repository.remove(user);
|
|
117
114
|
}
|
|
118
115
|
isOwnerGuard(uuid, currentUserUuid, attemptedAction) {
|
|
119
116
|
if (uuid !== currentUserUuid) {
|
|
@@ -130,7 +127,8 @@ PersonService = __decorate([
|
|
|
130
127
|
__param(0, typeorm_1.InjectRepository(person_entity_1.Person)),
|
|
131
128
|
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
132
129
|
CoreLoggerService_1.default,
|
|
133
|
-
authz_service_1.AuthZClientService
|
|
130
|
+
authz_service_1.AuthZClientService,
|
|
131
|
+
PersonConfigurationService_1.PersonConfigurationService])
|
|
134
132
|
], PersonService);
|
|
135
133
|
exports.PersonService = PersonService;
|
|
136
134
|
//# sourceMappingURL=person.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"person.service.js","sourceRoot":"","sources":["../../src/person/person.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAA6D;AAC7D,6CAAiD;AACjD,qCAAmC;AAEnC,gEAAgE;AAChE,oEAA2D;AAC3D,oFAA4D;AAC5D,sFAA0E;AAE1E,4DAAgD;
|
|
1
|
+
{"version":3,"file":"person.service.js","sourceRoot":"","sources":["../../src/person/person.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ const core_1 = require("@nestjs/core");
|
|
|
23
23
|
const CoreLoggerService_1 = __importDefault(require("../logger/CoreLoggerService"));
|
|
24
24
|
const CoreConfigurationService_1 = require("../core-config/CoreConfigurationService");
|
|
25
25
|
const LoggingInterceptor_1 = require("../logger/LoggingInterceptor");
|
|
26
|
-
const httpLogResponseContent_1 = require("./httpLogResponseContent");
|
|
27
26
|
const CoreConfig_module_1 = require("../core-config/CoreConfig.module");
|
|
28
27
|
const config_1 = require("@nestjs/config");
|
|
29
28
|
const organisation_module_1 = require("../organisation/organisation.module");
|
|
@@ -45,7 +44,6 @@ let CoreModule = class CoreModule {
|
|
|
45
44
|
forbidNonWhitelisted: true,
|
|
46
45
|
}));
|
|
47
46
|
app.useGlobalInterceptors(new common_1.ClassSerializerInterceptor(app.get(core_1.Reflector)), new LoggingInterceptor_1.LoggingInterceptor(loggerService));
|
|
48
|
-
app.useGlobalInterceptors(new httpLogResponseContent_1.HttpLogResponse());
|
|
49
47
|
loggerService.log(`will listen on port ${configService.webPort} (DEV: http://localhost:${configService.webPort} )`);
|
|
50
48
|
await callback(app);
|
|
51
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-app.module.js","sourceRoot":"","sources":["../../src/root-app/core-app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAsD;AACtD,+DAA+D;AAC/D,4DAA4D;AAC5D,4BAA0B;AAC1B,2CAMwB;AACxB,2DAAqD;AACrD,qDAA+C;AAC/C,+CAAyC;AACzC,6CAAwC;AACxC,uCAAoD;AACpD,oFAA4D;AAC5D,sFAAiF;AACjF,qEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"core-app.module.js","sourceRoot":"","sources":["../../src/root-app/core-app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAsD;AACtD,+DAA+D;AAC/D,4DAA4D;AAC5D,4BAA0B;AAC1B,2CAMwB;AACxB,2DAAqD;AACrD,qDAA+C;AAC/C,+CAAyC;AACzC,6CAAwC;AACxC,uCAAoD;AACpD,oFAA4D;AAC5D,sFAAiF;AACjF,qEAAgE;AAChE,wEAAkE;AAClE,2CAA4C;AAC5C,6EAAuE;AAavE,IAAa,UAAU,GAAvB,MAAa,UAAU;IACZ,MAAM,CAAC,eAAe;IACzB,gHAAgH;IAChH,UAAe,EACf,QAA+D,EAC/D,OAAgC;QAEhC,KAAK,CAAC,KAAK,IAAI,EAAE;YACb,IAAI;gBACA,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACjD,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,2BAAiB,CAAC,CAAC;gBACjD,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;gBACxD,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;gBAE7B,GAAG,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,aAAa,EAAC,CAAC,CAAC;gBACtD,GAAG,CAAC,cAAc,CACd,IAAI,uBAAc,CAAC;oBACf,SAAS,EAAE,IAAI;oBACf,qBAAqB,EAAE,KAAK;oBAC5B,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,IAAI;iBAC7B,CAAC,CACL,CAAC;gBACF,GAAG,CAAC,qBAAqB,CACrB,IAAI,mCAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAS,CAAC,CAAC,EAClD,IAAI,uCAAkB,CAAC,aAAa,CAAC,CACxC,CAAC;gBAEF,aAAa,CAAC,GAAG,CACb,uBAAuB,aAAa,CAAC,OAAO,2BAA2B,aAAa,CAAC,OAAO,IAAI,CACnG,CAAC;gBAEF,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,mBAAmB,EAAE;gBAC1B,uEAAuE;gBACvE,OAAO,CAAC,KAAK;gBACT,4EAA4E;gBAC5E,iCAAiC,mBAAmB,EAAE,CACzD,CAAC;gBACF,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACnB;QACL,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;CACJ,CAAA;AA5CY,UAAU;IAXtB,eAAM,CAAC;QACJ,OAAO,EAAE;YACL,qBAAY,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC;YACnC,4BAAY;YACZ,oCAAgB;YAChB,wCAAkB;SACrB;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,CAAC,wBAAU,EAAE,uBAAU,CAAC;QACnC,OAAO,EAAE,CAAC,uBAAU,CAAC;KACxB,CAAC;GACW,UAAU,CA4CtB;AA5CY,gCAAU"}
|
package/package.json
CHANGED
|
@@ -1,43 +0,0 @@
|
|
|
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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.HttpLogResponse = void 0;
|
|
10
|
-
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
11
|
-
const common_1 = require("@nestjs/common");
|
|
12
|
-
const operators_1 = require("rxjs/operators");
|
|
13
|
-
let HttpLogResponse = class HttpLogResponse {
|
|
14
|
-
constructor() {
|
|
15
|
-
this.logger = new common_1.Logger("HTTP");
|
|
16
|
-
}
|
|
17
|
-
intercept(context, next) {
|
|
18
|
-
const request = context.switchToHttp().getRequest();
|
|
19
|
-
const response = context.switchToHttp().getResponse();
|
|
20
|
-
const { originalUrl, method, params, query, body } = request;
|
|
21
|
-
this.logger.log({
|
|
22
|
-
type: "REQUEST",
|
|
23
|
-
originalUrl,
|
|
24
|
-
method,
|
|
25
|
-
params: params || undefined,
|
|
26
|
-
query: query || undefined,
|
|
27
|
-
body: body || undefined,
|
|
28
|
-
});
|
|
29
|
-
return next.handle().pipe(operators_1.tap((data) => this.logger.log({
|
|
30
|
-
type: "RESPONSE",
|
|
31
|
-
originalUrl,
|
|
32
|
-
method,
|
|
33
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
34
|
-
status: response?.status,
|
|
35
|
-
responseBody: data || undefined,
|
|
36
|
-
})));
|
|
37
|
-
}
|
|
38
|
-
};
|
|
39
|
-
HttpLogResponse = __decorate([
|
|
40
|
-
common_1.Injectable()
|
|
41
|
-
], HttpLogResponse);
|
|
42
|
-
exports.HttpLogResponse = HttpLogResponse;
|
|
43
|
-
//# sourceMappingURL=httpLogResponseContent.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"httpLogResponseContent.js","sourceRoot":"","sources":["../../src/root-app/httpLogResponseContent.ts"],"names":[],"mappings":";;;;;;;;;AAAA,4DAA4D;AAC5D,2CAMwB;AACxB,8CAAmC;AAInC,IAAa,eAAe,GAA5B,MAAa,eAAe;IAA5B;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;IA+BxC,CAAC;IA7BG,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAY,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QAE7D,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,CAAC;QAEtD,MAAM,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,SAAS;YACf,WAAW;YACX,MAAM;YACN,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,KAAK,EAAE,KAAK,IAAI,SAAS;YACzB,IAAI,EAAE,IAAI,IAAI,SAAS;SAC1B,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACrB,eAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,MAAM;YACN,sEAAsE;YACtE,MAAM,EAAE,QAAQ,EAAE,MAAM;YACxB,YAAY,EAAE,IAAI,IAAI,SAAS;SAClC,CAAC,CACL,CACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAhCY,eAAe;IAD3B,mBAAU,EAAE;GACA,eAAe,CAgC3B;AAhCY,0CAAe"}
|