@darraghor/nest-backend-libs 2.30.1 → 2.32.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/authorization/config/AuthConfigurationService.d.ts +1 -0
- package/dist/authorization/config/AuthConfigurationService.js +17 -1
- package/dist/authorization/config/AuthConfigurationService.js.map +1 -1
- package/dist/authorization/config/AuthConfigurationVariables.d.ts +2 -0
- package/dist/authorization/config/AuthConfigurationVariables.js +1 -0
- package/dist/authorization/config/AuthConfigurationVariables.js.map +1 -1
- package/dist/authorization/services/UserValidation.service.d.ts +6 -2
- package/dist/authorization/services/UserValidation.service.js +24 -5
- package/dist/authorization/services/UserValidation.service.js.map +1 -1
- package/dist/authorization/strategies/authzstrategy.js +1 -8
- package/dist/authorization/strategies/authzstrategy.js.map +1 -1
- package/dist/core-config/CoreConfigurationService.d.ts +0 -1
- package/dist/core-config/CoreConfigurationService.js +0 -9
- package/dist/core-config/CoreConfigurationService.js.map +1 -1
- package/dist/root-app/core-app.module.js +1 -4
- package/dist/root-app/core-app.module.js.map +1 -1
- package/dist/user-internal/dto/userResponseDto.d.ts +1 -1
- package/dist/user-internal/dto/userResponseDto.js +3 -1
- package/dist/user-internal/dto/userResponseDto.js.map +1 -1
- package/dist/user-internal/user.controller.js +9 -4
- package/dist/user-internal/user.controller.js.map +1 -1
- package/dist/user-internal/user.service.d.ts +1 -0
- package/dist/user-internal/user.service.js +13 -5
- package/dist/user-internal/user.service.js.map +1 -1
- package/package.json +31 -31
|
@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
11
11
|
import { Injectable } from "@nestjs/common";
|
|
12
12
|
import { ConfigService } from "@nestjs/config";
|
|
13
|
-
import { IsDefined, IsString } from "class-validator";
|
|
13
|
+
import { IsArray, IsDefined, IsString } from "class-validator";
|
|
14
14
|
import { ValidatedConfigurationService } from "../../configuration/ValidatedConfigurationService.js";
|
|
15
15
|
let AuthConfigurationService = class AuthConfigurationService extends ValidatedConfigurationService {
|
|
16
16
|
configService;
|
|
@@ -24,6 +24,16 @@ let AuthConfigurationService = class AuthConfigurationService extends ValidatedC
|
|
|
24
24
|
get auth0Domain() {
|
|
25
25
|
return this.configService.get("auth.auth0Domain");
|
|
26
26
|
}
|
|
27
|
+
get superUserIds() {
|
|
28
|
+
const ids = this.configService.get("auth.superUserIds");
|
|
29
|
+
if (ids === undefined) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
32
|
+
return ids
|
|
33
|
+
.split(",")
|
|
34
|
+
.map((id) => id.trim())
|
|
35
|
+
.filter((id) => id !== "");
|
|
36
|
+
}
|
|
27
37
|
};
|
|
28
38
|
__decorate([
|
|
29
39
|
IsDefined(),
|
|
@@ -37,6 +47,12 @@ __decorate([
|
|
|
37
47
|
__metadata("design:type", String),
|
|
38
48
|
__metadata("design:paramtypes", [])
|
|
39
49
|
], AuthConfigurationService.prototype, "auth0Domain", null);
|
|
50
|
+
__decorate([
|
|
51
|
+
IsDefined(),
|
|
52
|
+
IsArray(),
|
|
53
|
+
__metadata("design:type", Array),
|
|
54
|
+
__metadata("design:paramtypes", [])
|
|
55
|
+
], AuthConfigurationService.prototype, "superUserIds", null);
|
|
40
56
|
AuthConfigurationService = __decorate([
|
|
41
57
|
Injectable(),
|
|
42
58
|
__metadata("design:paramtypes", [ConfigService])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthConfigurationService.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthConfigurationService.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAC,6BAA6B,EAAC,MAAM,sDAAsD,CAAC;AAG5F,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;IAED,IAEI,WAAW;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAE,CAAC;IAC/D,CAAC;IAED,IAEI,YAAY;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAE,CAAC;QACjE,IAAI,GAAG,KAAK,SAAS,EAAE;YACnB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,GAAG;aACL,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,CAAC;CACJ,CAAA;AAxBG;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;2DAGV;AAED;IAAC,SAAS,EAAE;IACX,OAAO,EAAE;;;4DAUT;AA5BQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CA6BpC;SA7BY,wBAAwB"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
declare const _default: (() => {
|
|
2
2
|
auth0Domain: string | undefined;
|
|
3
3
|
auth0audience: string | undefined;
|
|
4
|
+
superUserIds: string | undefined;
|
|
4
5
|
}) & import("@nestjs/config").ConfigFactoryKeyHost<{
|
|
5
6
|
auth0Domain: string | undefined;
|
|
6
7
|
auth0audience: string | undefined;
|
|
8
|
+
superUserIds: string | undefined;
|
|
7
9
|
}>;
|
|
8
10
|
export default _default;
|
|
@@ -2,5 +2,6 @@ import { registerAs } from "@nestjs/config";
|
|
|
2
2
|
export default registerAs("auth", () => ({
|
|
3
3
|
auth0Domain: process.env.AUTH0_DOMAIN,
|
|
4
4
|
auth0audience: process.env.AUTH0_AUDIENCE,
|
|
5
|
+
superUserIds: process.env.SUPER_USER_IDS,
|
|
5
6
|
}));
|
|
6
7
|
//# sourceMappingURL=AuthConfigurationVariables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthConfigurationVariables.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationVariables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAE1C,eAAe,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IACrC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"AuthConfigurationVariables.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationVariables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAE1C,eAAe,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IACrC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;CAC3C,CAAC,CAAC,CAAC"}
|
|
@@ -3,16 +3,20 @@ import { AuthZClientService } from "../../authzclient/authz.service.js";
|
|
|
3
3
|
import { UserProfile } from "../../authzclient/UserProfile.dto.js";
|
|
4
4
|
import { Invitation } from "../../invitations/entities/invitation.entity.js";
|
|
5
5
|
import { User } from "../../user-internal/entities/user.entity.js";
|
|
6
|
+
import { AuthConfigurationService } from "../config/AuthConfigurationService.js";
|
|
6
7
|
import { AccessToken } from "../models/AccessToken.js";
|
|
8
|
+
import { RequestUser } from "../models/RequestWithUser.js";
|
|
7
9
|
export declare class UserValidationService {
|
|
8
10
|
private userRepository;
|
|
9
11
|
private authzClient;
|
|
10
12
|
private readonly invitationRepository;
|
|
13
|
+
private readonly config;
|
|
11
14
|
private readonly logger;
|
|
12
|
-
constructor(userRepository: Repository<User>, authzClient: AuthZClientService, invitationRepository: Repository<Invitation
|
|
15
|
+
constructor(userRepository: Repository<User>, authzClient: AuthZClientService, invitationRepository: Repository<Invitation>, config: AuthConfigurationService);
|
|
13
16
|
getAuth0User(rawAccessToken: string): Promise<UserProfile>;
|
|
14
17
|
validateUserApiKey(apiKey: string): Promise<User | undefined>;
|
|
15
|
-
|
|
18
|
+
addPermissionsToUser(user: User, authProviderPermissions: string[] | undefined): RequestUser;
|
|
19
|
+
validateUser(payload: AccessToken, rawAccessToken: string, invitationId?: string): Promise<RequestUser>;
|
|
16
20
|
private findUserForRequest;
|
|
17
21
|
handleInvitedUser(rawAccessToken: string, invitationCode: string): Promise<User>;
|
|
18
22
|
handleNewIndependentUser(foundUser: User | null, rawAccessToken: string): Promise<User>;
|
|
@@ -22,15 +22,18 @@ import { Roles } from "../../organisation/dto/RolesEnum.js";
|
|
|
22
22
|
import { MembershipRole } from "../../organisation/entities/member-role.entity.js";
|
|
23
23
|
import { Organisation } from "../../organisation/entities/organisation.entity.js";
|
|
24
24
|
import { User } from "../../user-internal/entities/user.entity.js";
|
|
25
|
+
import { AuthConfigurationService } from "../config/AuthConfigurationService.js";
|
|
25
26
|
let UserValidationService = UserValidationService_1 = class UserValidationService {
|
|
26
27
|
userRepository;
|
|
27
28
|
authzClient;
|
|
28
29
|
invitationRepository;
|
|
30
|
+
config;
|
|
29
31
|
logger = new Logger(UserValidationService_1.name);
|
|
30
|
-
constructor(userRepository, authzClient, invitationRepository) {
|
|
32
|
+
constructor(userRepository, authzClient, invitationRepository, config) {
|
|
31
33
|
this.userRepository = userRepository;
|
|
32
34
|
this.authzClient = authzClient;
|
|
33
35
|
this.invitationRepository = invitationRepository;
|
|
36
|
+
this.config = config;
|
|
34
37
|
}
|
|
35
38
|
async getAuth0User(rawAccessToken) {
|
|
36
39
|
const result = await this.authzClient.getUser(rawAccessToken);
|
|
@@ -54,10 +57,24 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
|
|
|
54
57
|
return undefined;
|
|
55
58
|
return result;
|
|
56
59
|
}
|
|
60
|
+
addPermissionsToUser(user, authProviderPermissions) {
|
|
61
|
+
console.debug({ list: this.config.superUserIds }, "super user ids");
|
|
62
|
+
if (!user?.id) {
|
|
63
|
+
throw new Error("Unable to authenticate and register a valid user with this auth0 user");
|
|
64
|
+
}
|
|
65
|
+
const permissionsSet = new Set(authProviderPermissions || []);
|
|
66
|
+
if (user.auth0UserId &&
|
|
67
|
+
this.config.superUserIds.includes(user.auth0UserId)) {
|
|
68
|
+
permissionsSet.add("read:all");
|
|
69
|
+
permissionsSet.add("modify:all");
|
|
70
|
+
}
|
|
71
|
+
// eslint-disable-next-line sonarjs/prefer-immediate-return
|
|
72
|
+
return { ...user, permissions: [...permissionsSet] };
|
|
73
|
+
}
|
|
57
74
|
async validateUser(payload, rawAccessToken, invitationId) {
|
|
58
75
|
if (invitationId) {
|
|
59
76
|
// even though there is commonality here it's easier to treat the invitation path as completely separate
|
|
60
|
-
return this.handleInvitedUser(rawAccessToken, invitationId);
|
|
77
|
+
return this.addPermissionsToUser(await this.handleInvitedUser(rawAccessToken, invitationId), payload.permissions);
|
|
61
78
|
}
|
|
62
79
|
// try to find the user and their memberships
|
|
63
80
|
const foundUser = await this.findUserForRequest(payload.sub);
|
|
@@ -70,10 +87,11 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
|
|
|
70
87
|
foundUser?.memberships !== undefined &&
|
|
71
88
|
foundUser?.memberships !== null &&
|
|
72
89
|
foundUser?.memberships?.length > 0) {
|
|
73
|
-
return foundUser;
|
|
90
|
+
return this.addPermissionsToUser(foundUser, payload.permissions);
|
|
74
91
|
}
|
|
75
92
|
// otherwise we need to add a membership to a user
|
|
76
|
-
|
|
93
|
+
const userResult = await this.handleNewIndependentUser(foundUser, rawAccessToken);
|
|
94
|
+
return this.addPermissionsToUser(userResult, payload.permissions);
|
|
77
95
|
}
|
|
78
96
|
async findUserForRequest(auth0UserId) {
|
|
79
97
|
return await this.userRepository.findOne({
|
|
@@ -191,7 +209,8 @@ UserValidationService = UserValidationService_1 = __decorate([
|
|
|
191
209
|
__param(2, InjectRepository(Invitation)),
|
|
192
210
|
__metadata("design:paramtypes", [Repository,
|
|
193
211
|
AuthZClientService,
|
|
194
|
-
Repository
|
|
212
|
+
Repository,
|
|
213
|
+
AuthConfigurationService])
|
|
195
214
|
], UserValidationService);
|
|
196
215
|
export { UserValidationService };
|
|
197
216
|
//# sourceMappingURL=UserValidation.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EACH,mBAAmB,EACnB,UAAU,EACV,MAAM,EACN,iBAAiB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AACrD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAC,UAAU,EAAC,MAAM,iDAAiD,CAAC;AAC3E,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,KAAK,EAAC,MAAM,qCAAqC,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,mDAAmD,CAAC;AACjF,OAAO,EAAC,YAAY,EAAC,MAAM,oDAAoD,CAAC;AAChF,OAAO,EAAC,IAAI,EAAC,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,14 +41,7 @@ let JwtStrategy = JwtStrategy_1 = class JwtStrategy extends PassportStrategy(Str
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
const invitationId = request.query.invitationId;
|
|
44
|
-
|
|
45
|
-
if (!userResult?.id) {
|
|
46
|
-
throw new Error("Unable to authenticate and register a valid user with this auth0 user");
|
|
47
|
-
}
|
|
48
|
-
const withPermissions = { permissions: payload.permissions || [] };
|
|
49
|
-
// eslint-disable-next-line sonarjs/prefer-immediate-return
|
|
50
|
-
const rp = { ...userResult, ...withPermissions };
|
|
51
|
-
return rp;
|
|
44
|
+
return this.userValidationService.validateUser(payload, rawAccessToken, invitationId);
|
|
52
45
|
}
|
|
53
46
|
};
|
|
54
47
|
JwtStrategy = JwtStrategy_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../../src/authorization/strategies/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAGrE,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,gBAAgB,CAAC,QAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,MAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,iBAAiB,CAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,WAAW,MAAM,CAAC,WAAW,wBAAwB;aACjE,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,UAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,WAAW,MAAM,CAAC,WAAW,GAAG;YACxC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAhBc,0BAAqB,GAArB,qBAAqB,CAAuB;IAiBjE,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,UAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAsB,CAAC;QAE1D,
|
|
1
|
+
{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../../src/authorization/strategies/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAGrE,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,gBAAgB,CAAC,QAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,MAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,iBAAiB,CAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,WAAW,MAAM,CAAC,WAAW,wBAAwB;aACjE,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,UAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,WAAW,MAAM,CAAC,WAAW,GAAG;YACxC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAhBc,0BAAqB,GAArB,qBAAqB,CAAuB;IAiBjE,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,UAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAsB,CAAC;QAE1D,OAAO,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAC1C,OAAO,EACP,cAAc,EACd,YAAY,CACf,CAAC;IACN,CAAC;CACJ,CAAA;AAzCY,WAAW;IADvB,UAAU,EAAE;qCAImC,qBAAqB;QACrD,wBAAwB;GAJ3B,WAAW,CAyCvB;SAzCY,WAAW"}
|
|
@@ -37,9 +37,6 @@ let CoreConfigurationService = class CoreConfigurationService extends ValidatedC
|
|
|
37
37
|
get frontEndAppUrl() {
|
|
38
38
|
return this.configService.get("core.frontEndAppUrl");
|
|
39
39
|
}
|
|
40
|
-
get marketingAppUrl() {
|
|
41
|
-
return this.configService.get("core.marketingAppUrl");
|
|
42
|
-
}
|
|
43
40
|
get nodeEnv() {
|
|
44
41
|
return this.configService.get("core.nodeEnv");
|
|
45
42
|
}
|
|
@@ -83,12 +80,6 @@ __decorate([
|
|
|
83
80
|
__metadata("design:type", String),
|
|
84
81
|
__metadata("design:paramtypes", [])
|
|
85
82
|
], CoreConfigurationService.prototype, "frontEndAppUrl", null);
|
|
86
|
-
__decorate([
|
|
87
|
-
IsDefined(),
|
|
88
|
-
IsString(),
|
|
89
|
-
__metadata("design:type", String),
|
|
90
|
-
__metadata("design:paramtypes", [])
|
|
91
|
-
], CoreConfigurationService.prototype, "marketingAppUrl", null);
|
|
92
83
|
__decorate([
|
|
93
84
|
IsDefined(),
|
|
94
85
|
IsString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,mDAAmD,CAAC;AAGzF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,qBAAqB,CAAE,CAAC;IAClE,CAAC;
|
|
1
|
+
{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,mDAAmD,CAAC;AAGzF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,qBAAqB,CAAE,CAAC;IAClE,CAAC;IAED,IAEI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,CAAC;IAC3D,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;CACJ,CAAA;AA3DG;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;qEAMX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;mFAOX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;iEAKX;AAED;IAAC,SAAS,EAAE;IACX,KAAK,EAAE;;;uDAMP;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;wDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;8DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;uDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AA/DQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CAgEpC;SAhEY,wBAAwB"}
|
|
@@ -42,10 +42,7 @@ let CoreModule = class CoreModule {
|
|
|
42
42
|
app.flushLogs();
|
|
43
43
|
app.use(helmet());
|
|
44
44
|
app.enableCors({
|
|
45
|
-
origin: [
|
|
46
|
-
configService.frontEndAppUrl,
|
|
47
|
-
configService.marketingAppUrl,
|
|
48
|
-
],
|
|
45
|
+
origin: [configService.frontEndAppUrl],
|
|
49
46
|
});
|
|
50
47
|
app.useGlobalPipes(new ValidationPipe({
|
|
51
48
|
transform: true,
|
|
@@ -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,OAAO,kBAAkB,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACH,0BAA0B,EAE1B,MAAM,EAEN,cAAc,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,YAAY,IAAI,mBAAmB,EAAC,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAAC,2BAA2B,EAAC,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAmDtD,IAAM,UAAU,GAAhB,MAAM,UAAU;IACZ,MAAM,CAAC,eAAe;IACzB,gHAAgH;IAChH,UAAe,EACf,QAA+D;IAC/D,6DAA6D;IAC7D,OAAgC;QAEhC,KAAK,CAAC,KAAK,IAAI,EAAE;YACb,IAAI;gBACA,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC7C,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC;gBACH,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACxD,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;gBAC7B,GAAG,CAAC,SAAS,EAAE,CAAC;gBAEhB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;gBAClB,GAAG,CAAC,UAAU,CAAC;oBACX,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"core-app.module.js","sourceRoot":"","sources":["../../src/root-app/core-app.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { OrganisationMembership } from "../../organisation-memberships/entities/organisation-membership.entity.js";
|
|
2
2
|
import { UserApiKey } from "../../user-api-key/userApiKey.entity.js";
|
|
3
3
|
export declare class UserDto {
|
|
4
|
-
isSuper
|
|
4
|
+
isSuper?: boolean;
|
|
5
5
|
id: number;
|
|
6
6
|
email: string;
|
|
7
7
|
uuid: string;
|
|
@@ -30,7 +30,9 @@ export class UserDto {
|
|
|
30
30
|
deletedDate;
|
|
31
31
|
}
|
|
32
32
|
__decorate([
|
|
33
|
-
|
|
33
|
+
ApiPropertyOptional({
|
|
34
|
+
description: "Is the user a super user. Only set if the user is the current user. Will not be set for list responses.",
|
|
35
|
+
}),
|
|
34
36
|
__metadata("design:type", Boolean)
|
|
35
37
|
], UserDto.prototype, "isSuper", void 0);
|
|
36
38
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userResponseDto.js","sourceRoot":"","sources":["../../../src/user-internal/dto/userResponseDto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AAEnE,MAAM,OAAO,OAAO;
|
|
1
|
+
{"version":3,"file":"userResponseDto.js","sourceRoot":"","sources":["../../../src/user-internal/dto/userResponseDto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AAEnE,MAAM,OAAO,OAAO;IAKhB,OAAO,CAAW;IAGlB,EAAE,CAAU;IAGZ,KAAK,CAAU;IAGR,IAAI,CAAU;IAGrB,aAAa,CAAW;IAGxB,OAAO,CAAW;IAGlB,IAAI,CAAU;IAGd,UAAU,CAAU;IAGpB,SAAS,CAAU;IAGnB,OAAO,CAAU;IAGjB,WAAW,CAAU;IAGrB,QAAQ,CAAU;IAGlB,WAAW,CAA4B;IAGvC,OAAO,CAAgB;IAGvB,WAAW,CAAQ;IAGnB,UAAU,CAAQ;IAGlB,WAAW,CAAQ;CACtB;AArDG;IAAC,mBAAmB,CAAC;QACjB,WAAW,EACP,yGAAyG;KAChH,CAAC;;wCACgB;AAElB;IAAC,WAAW,EAAE;;mCACF;AAEZ;IAAC,WAAW,EAAE;;sCACC;AAEf;IAAC,WAAW,EAAE;;qCACO;AAErB;IAAC,WAAW,EAAE;;8CACU;AAExB;IAAC,WAAW,EAAE;;wCACI;AAElB;IAAC,mBAAmB,EAAE;;qCACR;AAEd;IAAC,mBAAmB,EAAE;;2CACF;AAEpB;IAAC,mBAAmB,EAAE;;0CACH;AAEnB;IAAC,mBAAmB,EAAE;;wCACL;AAEjB;IAAC,mBAAmB,EAAE;;4CACD;AAErB;IAAC,mBAAmB,EAAE;;yCACJ;AAElB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,sBAAsB,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;4CAC1B;AAEvC;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wCAC9B;AAEvB;IAAC,WAAW,EAAE;8BACA,IAAI;4CAAC;AAEnB;IAAC,WAAW,EAAE;8BACD,IAAI;2CAAC;AAElB;IAAC,mBAAmB,EAAE;8BACR,IAAI;4CAAC"}
|
|
@@ -13,10 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
import { Controller, Get, Request, Body, Patch, Param, Delete, UseGuards, BadRequestException, } from "@nestjs/common";
|
|
14
14
|
import { UserService } from "./user.service.js";
|
|
15
15
|
import { UpdateUserDto } from "./dto/update-user.dto.js";
|
|
16
|
-
import { ApiBearerAuth, ApiOkResponse, ApiTags } from "@nestjs/swagger";
|
|
16
|
+
import { ApiBearerAuth, ApiOkResponse, ApiOperation, ApiTags, } from "@nestjs/swagger";
|
|
17
17
|
import { isUUID } from "class-validator";
|
|
18
18
|
import { BooleanResult } from "../root-app/models/boolean-result.js";
|
|
19
19
|
import { UserDto } from "./dto/userResponseDto.js";
|
|
20
|
+
import { User } from "./entities/user.entity.js";
|
|
20
21
|
import { DefaultAuthGuard } from "../authorization/guards/DefaultAuthGuard.js";
|
|
21
22
|
import { ClaimsAuthorisationGuard } from "../authorization/guards/ClaimsAuthorisationGuard.js";
|
|
22
23
|
import { SuperUserClaims } from "../authorization/models/SuperUserClaims.js";
|
|
@@ -39,16 +40,16 @@ let UserController = class UserController {
|
|
|
39
40
|
throw new BadRequestException(uuid, "Invalid UUID");
|
|
40
41
|
}
|
|
41
42
|
// find the user if they are in the same organisation as the user
|
|
43
|
+
// being searched for
|
|
42
44
|
const result = await this.userService.findOneIfSameOrganisation(uuid, request.user);
|
|
43
45
|
return {
|
|
44
46
|
...result,
|
|
45
47
|
memberships: request.user.memberships ?? [],
|
|
46
48
|
apiKeys: request.user.apiKeys ?? [],
|
|
47
|
-
isSuper: request.user.permissions.includes(SuperUserClaims.MODIFY_ALL),
|
|
48
49
|
};
|
|
49
50
|
}
|
|
50
51
|
async findAll() {
|
|
51
|
-
return
|
|
52
|
+
return this.userService.findAll();
|
|
52
53
|
}
|
|
53
54
|
async update(uuid, updateUserDto, request) {
|
|
54
55
|
const result = await this.userService.update(uuid, updateUserDto, request.user.uuid);
|
|
@@ -70,8 +71,12 @@ __decorate([
|
|
|
70
71
|
], UserController.prototype, "findOne", null);
|
|
71
72
|
__decorate([
|
|
72
73
|
Get(),
|
|
74
|
+
ApiOperation({
|
|
75
|
+
summary: "Get all users in the system. Limited to Super Admin role.",
|
|
76
|
+
tags: ["SuperPower"],
|
|
77
|
+
}),
|
|
73
78
|
MandatoryUserClaims("read:all"),
|
|
74
|
-
ApiOkResponse({ type:
|
|
79
|
+
ApiOkResponse({ type: User, isArray: true }),
|
|
75
80
|
__metadata("design:type", Function),
|
|
76
81
|
__metadata("design:paramtypes", []),
|
|
77
82
|
__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/user-internal/user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACH,UAAU,EACV,GAAG,EACH,OAAO,EACP,IAAI,EACJ,KAAK,EACL,KAAK,EACL,MAAM,EACN,SAAS,EACT,mBAAmB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/user-internal/user.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { UpdateUserDto } from "./dto/update-user.dto.js";
|
|
|
4
4
|
import { User } from "./entities/user.entity.js";
|
|
5
5
|
export declare class UserService {
|
|
6
6
|
private repository;
|
|
7
|
+
private readonly logger;
|
|
7
8
|
constructor(repository: Repository<User>);
|
|
8
9
|
findAll(): Promise<User[]>;
|
|
9
10
|
findOneByAuth0Id(auth0Id: string): Promise<User | undefined>;
|
|
@@ -10,19 +10,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
-
|
|
13
|
+
var UserService_1;
|
|
14
|
+
import { Injectable, Logger, NotFoundException } from "@nestjs/common";
|
|
14
15
|
import { InjectRepository } from "@nestjs/typeorm";
|
|
15
16
|
import { Repository } from "typeorm";
|
|
16
17
|
import { Roles } from "../organisation/dto/RolesEnum.js";
|
|
17
18
|
import { User } from "./entities/user.entity.js";
|
|
18
|
-
let UserService = class UserService {
|
|
19
|
+
let UserService = UserService_1 = class UserService {
|
|
19
20
|
repository;
|
|
20
|
-
|
|
21
|
+
logger = new Logger(UserService_1.name);
|
|
21
22
|
constructor(repository) {
|
|
22
23
|
this.repository = repository;
|
|
23
24
|
}
|
|
24
25
|
async findAll() {
|
|
25
|
-
|
|
26
|
+
const allUsers = await this.repository.find({
|
|
27
|
+
relations: {
|
|
28
|
+
memberships: true,
|
|
29
|
+
apiKeys: true,
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
this.logger.debug({ allUsers }, "Found all users");
|
|
33
|
+
return allUsers;
|
|
26
34
|
}
|
|
27
35
|
async findOneByAuth0Id(auth0Id) {
|
|
28
36
|
return this.repository.findOneOrFail({
|
|
@@ -103,7 +111,7 @@ let UserService = class UserService {
|
|
|
103
111
|
}
|
|
104
112
|
}
|
|
105
113
|
};
|
|
106
|
-
UserService = __decorate([
|
|
114
|
+
UserService = UserService_1 = __decorate([
|
|
107
115
|
Injectable(),
|
|
108
116
|
__param(0, InjectRepository(User)),
|
|
109
117
|
__metadata("design:paramtypes", [Repository])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user-internal/user.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user-internal/user.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darraghor/nest-backend-libs",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.32.0",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
5
5
|
"description": "Some helpers for personal projects in nestjs",
|
|
6
6
|
"homepage": "https://github.com/darraghoriordan/nest-backend-libs",
|
|
@@ -60,16 +60,16 @@
|
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
62
|
"@nestjs/axios": "2.0.0",
|
|
63
|
-
"@nestjs/common": "^9.3.
|
|
63
|
+
"@nestjs/common": "^9.3.10",
|
|
64
64
|
"@nestjs/config": "^2.3.1",
|
|
65
|
-
"@nestjs/core": "^9.3.
|
|
66
|
-
"@nestjs/microservices": "9.3.
|
|
65
|
+
"@nestjs/core": "^9.3.10",
|
|
66
|
+
"@nestjs/microservices": "9.3.10",
|
|
67
67
|
"@nestjs/passport": "^9.0.3",
|
|
68
|
-
"@nestjs/platform-express": "^9.3.
|
|
68
|
+
"@nestjs/platform-express": "^9.3.10",
|
|
69
69
|
"@nestjs/swagger": "^6.2.1",
|
|
70
|
-
"@nestjs/terminus": "9.2.
|
|
70
|
+
"@nestjs/terminus": "9.2.1",
|
|
71
71
|
"@nestjs/typeorm": "^9.0.0",
|
|
72
|
-
"auth0": "3.
|
|
72
|
+
"auth0": "3.3.0",
|
|
73
73
|
"bull": "4.10.4",
|
|
74
74
|
"chalk": "5.2.0",
|
|
75
75
|
"class-transformer": "0.5.1",
|
|
@@ -78,60 +78,60 @@
|
|
|
78
78
|
"dotenv": "16.0.3",
|
|
79
79
|
"helmet": "6.0.1",
|
|
80
80
|
"jwks-rsa": "3.0.1",
|
|
81
|
-
"knip": "1.
|
|
81
|
+
"knip": "1.16.0",
|
|
82
82
|
"nanoid": "4.0.1",
|
|
83
83
|
"nestjs-pino": "3.1.2",
|
|
84
84
|
"nodemailer": "6.9.1",
|
|
85
85
|
"passport": "0.6.0",
|
|
86
86
|
"passport-headerapikey": "1.2.2",
|
|
87
87
|
"passport-jwt": "4.0.1",
|
|
88
|
-
"pg": "8.
|
|
88
|
+
"pg": "8.10.0",
|
|
89
89
|
"pino-http": "8.3.3",
|
|
90
|
-
"pino-pretty": "
|
|
90
|
+
"pino-pretty": "10.0.0",
|
|
91
91
|
"reflect-metadata": "0.1.13",
|
|
92
92
|
"res": "^0.4.0",
|
|
93
93
|
"resource": "0.8.1",
|
|
94
|
-
"rimraf": "4.
|
|
94
|
+
"rimraf": "4.4.0",
|
|
95
95
|
"rxjs": "7.8.0",
|
|
96
|
-
"stripe": "11.
|
|
97
|
-
"swagger-ui-express": "4.6.
|
|
98
|
-
"twitter-api-v2": "1.14.
|
|
96
|
+
"stripe": "11.15.0",
|
|
97
|
+
"swagger-ui-express": "4.6.2",
|
|
98
|
+
"twitter-api-v2": "1.14.2",
|
|
99
99
|
"typeorm": "^0.3.12"
|
|
100
100
|
},
|
|
101
101
|
"devDependencies": {
|
|
102
|
-
"@commitlint/cli": "17.4.
|
|
103
|
-
"@commitlint/config-conventional": "17.4.
|
|
104
|
-
"@darraghor/eslint-plugin-nestjs-typed": "3.
|
|
102
|
+
"@commitlint/cli": "17.4.4",
|
|
103
|
+
"@commitlint/config-conventional": "17.4.4",
|
|
104
|
+
"@darraghor/eslint-plugin-nestjs-typed": "3.19.0",
|
|
105
105
|
"@nestjs/bull": "0.6.3",
|
|
106
|
-
"@nestjs/cli": "9.
|
|
106
|
+
"@nestjs/cli": "9.3.0",
|
|
107
107
|
"@nestjs/schematics": "^9.0.4",
|
|
108
108
|
"@semantic-release/changelog": "6.0.2",
|
|
109
109
|
"@semantic-release/exec": "6.0.3",
|
|
110
|
-
"@types/auth0": "2.35.
|
|
110
|
+
"@types/auth0": "2.35.11",
|
|
111
111
|
"@types/express": "4.17.17",
|
|
112
|
-
"@types/jest": "29.
|
|
113
|
-
"@types/node": "18.
|
|
112
|
+
"@types/jest": "29.5.0",
|
|
113
|
+
"@types/node": "18.15.3",
|
|
114
114
|
"@types/nodemailer": "6.4.7",
|
|
115
115
|
"@types/passport-jwt": "3.0.8",
|
|
116
116
|
"@types/supertest": "2.0.12",
|
|
117
|
-
"@typescript-eslint/eslint-plugin": "5.
|
|
118
|
-
"@typescript-eslint/parser": "5.
|
|
117
|
+
"@typescript-eslint/eslint-plugin": "5.55.0",
|
|
118
|
+
"@typescript-eslint/parser": "5.55.0",
|
|
119
119
|
"copyfiles": "2.4.1",
|
|
120
|
-
"eslint": "8.
|
|
121
|
-
"eslint-config-prettier": "8.
|
|
120
|
+
"eslint": "8.36.0",
|
|
121
|
+
"eslint-config-prettier": "8.7.0",
|
|
122
122
|
"eslint-plugin-eslint-comments": "3.2.0",
|
|
123
123
|
"eslint-plugin-jest": "27.2.1",
|
|
124
|
-
"eslint-plugin-jsdoc": "40.
|
|
124
|
+
"eslint-plugin-jsdoc": "40.1.0",
|
|
125
125
|
"eslint-plugin-prefer-arrow": "1.2.3",
|
|
126
126
|
"eslint-plugin-promise": "6.1.1",
|
|
127
127
|
"eslint-plugin-sonarjs": "0.18.0",
|
|
128
|
-
"eslint-plugin-unicorn": "
|
|
128
|
+
"eslint-plugin-unicorn": "46.0.0",
|
|
129
129
|
"husky": "8.0.3",
|
|
130
|
-
"jest": "29.
|
|
130
|
+
"jest": "29.5.0",
|
|
131
131
|
"jest-create-mock-instance": "2.0.0",
|
|
132
|
-
"lint-staged": "13.
|
|
133
|
-
"prettier": "2.8.
|
|
134
|
-
"semantic-release": "20.1.
|
|
132
|
+
"lint-staged": "13.2.0",
|
|
133
|
+
"prettier": "2.8.5",
|
|
134
|
+
"semantic-release": "20.1.3",
|
|
135
135
|
"ts-jest": "29.0.5",
|
|
136
136
|
"ts-loader": "9.4.2",
|
|
137
137
|
"ts-node": "10.9.1",
|