@darraghor/nest-backend-libs 3.9.4 → 3.10.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/authz.module.js +0 -1
- package/dist/authorization/authz.module.js.map +1 -1
- package/dist/authorization/services/UserValidation.service.js +2 -2
- package/dist/authorization/services/UserValidation.service.js.map +1 -1
- package/dist/invitations/invitation.service.d.ts +3 -4
- package/dist/invitations/invitation.service.js +72 -57
- package/dist/invitations/invitation.service.js.map +1 -1
- package/dist/organisation/entities/organisation.entity.js +0 -1
- package/dist/organisation/entities/organisation.entity.js.map +1 -1
- package/dist/organisation-memberships/organisation-memberships.service.js +3 -3
- package/dist/organisation-memberships/organisation-memberships.service.js.map +1 -1
- package/dist/stripe-client/StripeClientProvider.js +1 -1
- package/dist/stripe-client/models/StripeCheckoutSessionRequestDto.js +2 -1
- package/dist/stripe-client/models/StripeCheckoutSessionRequestDto.js.map +1 -1
- package/dist/stripe-client/services/auth-stripe-checkout.service.js +3 -3
- package/dist/stripe-client/services/auth-stripe-checkout.service.js.map +1 -1
- package/dist/stripe-client/services/subscriptionRecord.mapper.js +7 -3
- package/dist/stripe-client/services/subscriptionRecord.mapper.js.map +1 -1
- package/dist/user/user.service.js +2 -2
- package/dist/user/user.service.js.map +1 -1
- package/dist/user-api-key/userApiKey.entity.js +2 -0
- package/dist/user-api-key/userApiKey.entity.js.map +1 -1
- package/package.json +51 -51
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authz.module.js","sourceRoot":"","sources":["../../src/authorization/authz.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,wBAAwB,EAAC,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"authz.module.js","sourceRoot":"","sources":["../../src/authorization/authz.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,wBAAwB,EAAC,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;AAiBjE,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAfvB,MAAM,CAAC;QACJ,OAAO,EAAE;YACL,iBAAiB;YACjB,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC;YACxC,cAAc,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAE,KAAK,EAAC,CAAC;YACjD,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAC/C;QACD,SAAS,EAAE;YACP,cAAc;YACd,wBAAwB;YACxB,WAAW;YACX,qBAAqB;SACxB;QACD,OAAO,EAAE,CAAC,wBAAwB,EAAE,cAAc,CAAC;KACtD,CAAC;GACW,WAAW,CAAG"}
|
|
@@ -49,7 +49,7 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
|
|
|
49
49
|
return result;
|
|
50
50
|
}
|
|
51
51
|
addPermissionsToUser(user, authProviderPermissions) {
|
|
52
|
-
|
|
52
|
+
this.logger.debug({
|
|
53
53
|
list: this.config.superUserIds,
|
|
54
54
|
userId: user.uuid,
|
|
55
55
|
userMail: user.email,
|
|
@@ -60,7 +60,7 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
|
|
|
60
60
|
const permissionsSet = new Set(authProviderPermissions || []);
|
|
61
61
|
if (user.auth0UserId &&
|
|
62
62
|
this.config.superUserIds.includes(user.auth0UserId)) {
|
|
63
|
-
|
|
63
|
+
this.logger.log("Super user detected, adding additional permissions: " +
|
|
64
64
|
user.auth0UserId);
|
|
65
65
|
permissionsSet.add("read:all");
|
|
66
66
|
permissionsSet.add("modify:all");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,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;AACtE,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,oCAAoC,CAAC;AACxD,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAMxE,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAIlB;IACA;IAES;IACA;IAPJ,MAAM,GAAG,IAAI,MAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IACjE,YAEY,cAAgC,EAChC,WAA+B,EAEtB,oBAA4C,EAC5C,MAAgC;QAJzC,mBAAc,GAAd,cAAc,CAAkB;QAChC,gBAAW,GAAX,WAAW,CAAoB;QAEtB,yBAAoB,GAApB,oBAAoB,CAAwB;QAC5C,WAAM,GAAN,MAAM,CAA0B;IAClD,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,cAAsB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC7D,CAAC;QAED,8DAA8D;QAC9D,yDAAyD;QACzD,yCAAyC;QACzC,qCAAqC;QACrC,wFAAwF;QACxF,SAAS;QACT,IAAI;QAEJ,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,oBAAoB,CAChB,IAAU,EACV,uBAA6C;QAE7C,
|
|
1
|
+
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
|
-
import { Repository } from "typeorm";
|
|
1
|
+
import { DataSource, Repository } from "typeorm";
|
|
2
2
|
import { CreateInvitationDto } from "./dto/create-invitation.dto.js";
|
|
3
3
|
import { Invitation } from "./entities/invitation.entity.js";
|
|
4
4
|
import { SmtpEmailClient } from "../smtp-email-client/email-client.service.js";
|
|
5
5
|
import { InvitationsConfigurationService } from "./InvitationConfigurationService.js";
|
|
6
6
|
import { RequestUser } from "../authorization/models/RequestWithUser.js";
|
|
7
7
|
import { OrganisationMembership } from "../organisation-memberships/entities/organisation-membership.entity.js";
|
|
8
|
-
import { User } from "../user/entities/user.entity.js";
|
|
9
8
|
export declare class InvitationService {
|
|
10
9
|
private invitationRepository;
|
|
11
10
|
private orgMembershipRepository;
|
|
12
|
-
private userRepository;
|
|
13
11
|
private readonly emailClient;
|
|
14
12
|
private readonly configService;
|
|
13
|
+
private readonly dataSource;
|
|
15
14
|
private readonly logger;
|
|
16
|
-
constructor(invitationRepository: Repository<Invitation>, orgMembershipRepository: Repository<OrganisationMembership>,
|
|
15
|
+
constructor(invitationRepository: Repository<Invitation>, orgMembershipRepository: Repository<OrganisationMembership>, emailClient: SmtpEmailClient, configService: InvitationsConfigurationService, dataSource: DataSource);
|
|
17
16
|
getOneActiveInvitation(invitationCode: string): Promise<Invitation | null>;
|
|
18
17
|
getAllForOrg(orgId: string, requestUser: RequestUser): Promise<Invitation[]>;
|
|
19
18
|
create(createDto: CreateInvitationDto, createdBy: RequestUser): Promise<Invitation>;
|
|
@@ -11,9 +11,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
var InvitationService_1;
|
|
14
|
-
import { BadRequestException, ForbiddenException, Injectable,
|
|
14
|
+
import { BadRequestException, ConflictException, ForbiddenException, Injectable, InternalServerErrorException, Logger, } from "@nestjs/common";
|
|
15
15
|
import { InjectRepository } from "@nestjs/typeorm";
|
|
16
|
-
import { IsNull, MoreThan, Repository } from "typeorm";
|
|
16
|
+
import { DataSource, IsNull, MoreThan, Repository } from "typeorm";
|
|
17
17
|
import { Roles } from "../organisation/dto/RolesEnum.js";
|
|
18
18
|
import { Invitation } from "./entities/invitation.entity.js";
|
|
19
19
|
import { SmtpEmailClient } from "../smtp-email-client/email-client.service.js";
|
|
@@ -24,16 +24,16 @@ import { User } from "../user/entities/user.entity.js";
|
|
|
24
24
|
let InvitationService = InvitationService_1 = class InvitationService {
|
|
25
25
|
invitationRepository;
|
|
26
26
|
orgMembershipRepository;
|
|
27
|
-
userRepository;
|
|
28
27
|
emailClient;
|
|
29
28
|
configService;
|
|
29
|
+
dataSource;
|
|
30
30
|
logger = new Logger(InvitationService_1.name);
|
|
31
|
-
constructor(invitationRepository, orgMembershipRepository,
|
|
31
|
+
constructor(invitationRepository, orgMembershipRepository, emailClient, configService, dataSource) {
|
|
32
32
|
this.invitationRepository = invitationRepository;
|
|
33
33
|
this.orgMembershipRepository = orgMembershipRepository;
|
|
34
|
-
this.userRepository = userRepository;
|
|
35
34
|
this.emailClient = emailClient;
|
|
36
35
|
this.configService = configService;
|
|
36
|
+
this.dataSource = dataSource;
|
|
37
37
|
}
|
|
38
38
|
async getOneActiveInvitation(invitationCode) {
|
|
39
39
|
return this.invitationRepository.findOne({
|
|
@@ -89,61 +89,80 @@ let InvitationService = InvitationService_1 = class InvitationService {
|
|
|
89
89
|
(r) => r.name === Roles.member || r.name === Roles.owner))) {
|
|
90
90
|
const message = "A user with this email address is already a member of this organisation";
|
|
91
91
|
this.logger.error(message, { createDto, createdBy });
|
|
92
|
-
throw new
|
|
92
|
+
throw new ConflictException(message);
|
|
93
93
|
}
|
|
94
|
-
if (existingMemberships.some((m) => m.invitations?.some((mi) => mi.acceptedOn ===
|
|
94
|
+
if (existingMemberships.some((m) => m.invitations?.some((mi) => mi.acceptedOn === undefined && mi.expiresOn > new Date()))) {
|
|
95
95
|
const message = "An valid invitation with this email already exists for this organisation";
|
|
96
96
|
this.logger.error(message, { createDto, createdBy });
|
|
97
97
|
throw new BadRequestException(message);
|
|
98
98
|
}
|
|
99
|
-
//
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
where: { id: savedMembership.id },
|
|
123
|
-
relations: {
|
|
124
|
-
invitations: true,
|
|
125
|
-
organisation: true,
|
|
126
|
-
},
|
|
127
|
-
});
|
|
128
|
-
if (!retrievedMembership) {
|
|
129
|
-
this.logger.error("New membership did not save correctly", {
|
|
130
|
-
createDto,
|
|
131
|
-
createdBy,
|
|
132
|
-
createdMembershipId: savedMembership?.id,
|
|
99
|
+
// Use a transaction to ensure all related entities are saved atomically
|
|
100
|
+
const queryRunner = this.dataSource.createQueryRunner();
|
|
101
|
+
await queryRunner.connect();
|
|
102
|
+
await queryRunner.startTransaction();
|
|
103
|
+
let retrievedMembership;
|
|
104
|
+
let validInvitation;
|
|
105
|
+
try {
|
|
106
|
+
// new empty user
|
|
107
|
+
const user = new User();
|
|
108
|
+
user.email = createDto.emailAddress;
|
|
109
|
+
const savedUser = await queryRunner.manager.save(user);
|
|
110
|
+
// new role
|
|
111
|
+
const role = new MembershipRole();
|
|
112
|
+
role.name = Roles.invited;
|
|
113
|
+
// a new invitation
|
|
114
|
+
const unsavedInvitation = new Invitation();
|
|
115
|
+
unsavedInvitation.emailAddress = createDto.emailAddress;
|
|
116
|
+
unsavedInvitation.expiresOn = new Date();
|
|
117
|
+
unsavedInvitation.expiresOn.setDate(unsavedInvitation.expiresOn.getDate() + 1);
|
|
118
|
+
unsavedInvitation.givenName = createDto.givenName;
|
|
119
|
+
// create a new membership
|
|
120
|
+
const membership = queryRunner.manager.create(OrganisationMembership, {
|
|
121
|
+
invitations: [],
|
|
133
122
|
});
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
123
|
+
membership.organisationId = createDto.organisationId;
|
|
124
|
+
membership.userId = savedUser.id;
|
|
125
|
+
membership.invitations?.push(unsavedInvitation);
|
|
126
|
+
membership.roles = [role];
|
|
127
|
+
const savedMembership = await queryRunner.manager.save(membership);
|
|
128
|
+
const foundMembership = await queryRunner.manager.findOne(OrganisationMembership, {
|
|
129
|
+
where: { id: savedMembership.id },
|
|
130
|
+
relations: {
|
|
131
|
+
invitations: true,
|
|
132
|
+
organisation: true,
|
|
133
|
+
},
|
|
142
134
|
});
|
|
143
|
-
|
|
135
|
+
if (!foundMembership) {
|
|
136
|
+
this.logger.error("New membership did not save correctly", {
|
|
137
|
+
createDto,
|
|
138
|
+
createdBy,
|
|
139
|
+
createdMembershipId: savedMembership.id,
|
|
140
|
+
});
|
|
141
|
+
throw new InternalServerErrorException("New membership did not save correctly");
|
|
142
|
+
}
|
|
143
|
+
retrievedMembership = foundMembership;
|
|
144
|
+
const foundInvitation = retrievedMembership.invitations?.find((invitation) => invitation.expiresOn > new Date() &&
|
|
145
|
+
invitation.acceptedOn === undefined);
|
|
146
|
+
if (!foundInvitation) {
|
|
147
|
+
this.logger.error("New invitation did not save correctly", {
|
|
148
|
+
createDto,
|
|
149
|
+
createdBy,
|
|
150
|
+
createdMembershipId: savedMembership.id,
|
|
151
|
+
});
|
|
152
|
+
throw new InternalServerErrorException("New invitation did not save correctly");
|
|
153
|
+
}
|
|
154
|
+
validInvitation = foundInvitation;
|
|
155
|
+
await queryRunner.commitTransaction();
|
|
156
|
+
}
|
|
157
|
+
catch (error) {
|
|
158
|
+
await queryRunner.rollbackTransaction();
|
|
159
|
+
throw error;
|
|
160
|
+
}
|
|
161
|
+
finally {
|
|
162
|
+
await queryRunner.release();
|
|
144
163
|
}
|
|
145
164
|
// try to email the invitation
|
|
146
|
-
await this.emailClient.sendMail([
|
|
165
|
+
await this.emailClient.sendMail([validInvitation.emailAddress], [], `Invitation to join ${retrievedMembership.organisation.name}`, createdBy.uuid, `You have been invited to join ${retrievedMembership.organisation.name} by ${createdBy.givenName ?? "another member"}. Please click the link below to accept the invitation.
|
|
147
166
|
|
|
148
167
|
${this.configService.baseUrl}/accept-invitation/${validInvitation.uuid}`);
|
|
149
168
|
// if it gets to here we have a queued invitation
|
|
@@ -204,9 +223,6 @@ let InvitationService = InvitationService_1 = class InvitationService {
|
|
|
204
223
|
organisationMembership: { organisation: true },
|
|
205
224
|
},
|
|
206
225
|
});
|
|
207
|
-
if (!invitation) {
|
|
208
|
-
throw new NotFoundException();
|
|
209
|
-
}
|
|
210
226
|
await this.canManageInvitationsForThisOrg({
|
|
211
227
|
orgId: invitation.organisationMembership.organisation.id,
|
|
212
228
|
user: currentUser,
|
|
@@ -218,12 +234,11 @@ InvitationService = InvitationService_1 = __decorate([
|
|
|
218
234
|
Injectable(),
|
|
219
235
|
__param(0, InjectRepository(Invitation)),
|
|
220
236
|
__param(1, InjectRepository(OrganisationMembership)),
|
|
221
|
-
__param(2, InjectRepository(User)),
|
|
222
237
|
__metadata("design:paramtypes", [Repository,
|
|
223
|
-
Repository,
|
|
224
238
|
Repository,
|
|
225
239
|
SmtpEmailClient,
|
|
226
|
-
InvitationsConfigurationService
|
|
240
|
+
InvitationsConfigurationService,
|
|
241
|
+
DataSource])
|
|
227
242
|
], InvitationService);
|
|
228
243
|
export { InvitationService };
|
|
229
244
|
//# sourceMappingURL=invitation.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.service.js","sourceRoot":"","sources":["../../src/invitations/invitation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"invitation.service.js","sourceRoot":"","sources":["../../src/invitations/invitation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,6 @@ __decorate([
|
|
|
50
50
|
OneToMany(() => OrganisationSubscriptionRecord, (osr) => osr.organisation, {
|
|
51
51
|
cascade: ["insert", "update"],
|
|
52
52
|
}),
|
|
53
|
-
Type(() => OrganisationSubscriptionRecord),
|
|
54
53
|
__metadata("design:type", Array)
|
|
55
54
|
], Organisation.prototype, "subscriptionRecords", void 0);
|
|
56
55
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;
|
|
1
|
+
{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;IAWvC,mBAAmB,CAAoC;IAIvD,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AA3CG;IAFC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;wCACF;AASL;IAPN,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;0CACa;AAMrB;IAJC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;iDACI;AAWvC;IATC,mBAAmB,CAAC,EAAC,IAAI,EAAE,8BAA8B,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IAC1E,IAAI,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;IAC1C,SAAS,CACN,GAAG,EAAE,CAAC,8BAA8B,EACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EACzB;QACI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CACJ;;yDACsD;AAIvD;IAFC,MAAM,EAAE;IACR,WAAW,EAAE;;0CACA;AAId;IAFC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAInB;IAFC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;gDAAC;AAIlB;IAFC,gBAAgB,EAAE;IAClB,mBAAmB,EAAE;8BACR,IAAI;iDAAC;AA7CV,YAAY;IADxB,MAAM,EAAE;GACI,YAAY,CA8CxB"}
|
|
@@ -10,7 +10,7 @@ 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
|
-
import { Injectable, NotFoundException } from "@nestjs/common";
|
|
13
|
+
import { ForbiddenException, Injectable, NotFoundException, } from "@nestjs/common";
|
|
14
14
|
import { InjectRepository } from "@nestjs/typeorm";
|
|
15
15
|
import { Repository } from "typeorm";
|
|
16
16
|
import { Invitation } from "../invitations/entities/invitation.entity.js";
|
|
@@ -43,7 +43,7 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
|
|
|
43
43
|
// is the user a member of the organisation?
|
|
44
44
|
const isAMember = memberships.some((m) => m.user.id === currentUserId);
|
|
45
45
|
if (!isAMember) {
|
|
46
|
-
throw new
|
|
46
|
+
throw new ForbiddenException("You are not a member of this organisation");
|
|
47
47
|
}
|
|
48
48
|
return memberships;
|
|
49
49
|
}
|
|
@@ -120,7 +120,7 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
|
|
|
120
120
|
// remove the membership
|
|
121
121
|
const membership = org.memberships?.find((m) => m.uuid === membershipUuid);
|
|
122
122
|
if (!membership) {
|
|
123
|
-
throw new
|
|
123
|
+
throw new NotFoundException("Membership not found");
|
|
124
124
|
}
|
|
125
125
|
// cascade to invitations
|
|
126
126
|
if (membership.invitations) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation-memberships.service.js","sourceRoot":"","sources":["../../src/organisation-memberships/organisation-memberships.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"organisation-memberships.service.js","sourceRoot":"","sources":["../../src/organisation-memberships/organisation-memberships.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { StripeClientConfigurationService } from "./StripeClientConfigurationSer
|
|
|
3
3
|
export const StripeClientProvider = {
|
|
4
4
|
provide: "StripeClient",
|
|
5
5
|
useFactory: (config) => {
|
|
6
|
-
const apiVersion = "2025-
|
|
6
|
+
const apiVersion = "2025-11-17.clover";
|
|
7
7
|
const appInfo = {
|
|
8
8
|
name: "NestBackendLibs",
|
|
9
9
|
url: "https://github.com/darraghoriordan/nest-backend-libs", // Optional
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
};
|
|
12
12
|
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
|
|
13
13
|
import { Type } from "class-transformer";
|
|
14
|
-
import { IsArray, IsIn, IsOptional, IsString, ValidateNested, } from "class-validator";
|
|
14
|
+
import { IsArray, IsIn, IsOptional, IsString, IsUUID, ValidateNested, } from "class-validator";
|
|
15
15
|
import { StripeCheckoutLineItem } from "./StripeCheckoutLineItem.js";
|
|
16
16
|
export class StripeCheckoutSessionRequestDto {
|
|
17
17
|
organisationUuid;
|
|
@@ -24,6 +24,7 @@ export class StripeCheckoutSessionRequestDto {
|
|
|
24
24
|
__decorate([
|
|
25
25
|
ApiPropertyOptional(),
|
|
26
26
|
IsOptional(),
|
|
27
|
+
IsUUID("4"),
|
|
27
28
|
__metadata("design:type", String)
|
|
28
29
|
], StripeCheckoutSessionRequestDto.prototype, "organisationUuid", void 0);
|
|
29
30
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripeCheckoutSessionRequestDto.js","sourceRoot":"","sources":["../../../src/stripe-client/models/StripeCheckoutSessionRequestDto.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,0CAA0C;;;;;;;;;;AAE1C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AACvC,OAAO,EACH,OAAO,EACP,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,cAAc,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,MAAM,OAAO,+BAA+B;
|
|
1
|
+
{"version":3,"file":"StripeCheckoutSessionRequestDto.js","sourceRoot":"","sources":["../../../src/stripe-client/models/StripeCheckoutSessionRequestDto.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,0CAA0C;;;;;;;;;;AAE1C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AACvC,OAAO,EACH,OAAO,EACP,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,EACN,cAAc,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,MAAM,OAAO,+BAA+B;IAIxC,gBAAgB,CAAU;IAM1B,SAAS,CAA4B;IAErC,yGAAyG;IAGzG,IAAI,CAAwC;IAO5C,mBAAmB,CAAU;IAO7B,kBAAkB,CAAU;CAC/B;AA1BG;IAHC,mBAAmB,EAAE;IACrB,UAAU,EAAE;IACZ,MAAM,CAAC,GAAG,CAAC;;yEACc;AAM1B;IAJC,WAAW,CAAC,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAC,CAAC;IAC1D,OAAO,EAAE;IACT,cAAc,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;kEACE;AAKrC;IAFC,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;IAC3B,IAAI,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;;6DACC;AAO5C;IALC,WAAW,CAAC;QACT,WAAW,EACP,kKAAkK;KACzK,CAAC;IACD,QAAQ,EAAE;;4EACkB;AAO7B;IALC,mBAAmB,CAAC;QACjB,WAAW,EACP,+KAA+K;KACtL,CAAC;IACD,UAAU,EAAE;;2EACe"}
|
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
var AuthenticatedStripeCheckoutService_1;
|
|
11
11
|
/* eslint-disable @typescript-eslint/naming-convention */
|
|
12
|
-
import { Injectable, Logger } from "@nestjs/common";
|
|
12
|
+
import { ForbiddenException, Injectable, Logger } from "@nestjs/common";
|
|
13
13
|
import { OrganisationSubscriptionService } from "../../organisation-subscriptions/organisation-subscriptions.service.js";
|
|
14
14
|
import { StripeCheckoutService } from "./stripe-checkout.service.js";
|
|
15
15
|
let AuthenticatedStripeCheckoutService = AuthenticatedStripeCheckoutService_1 = class AuthenticatedStripeCheckoutService {
|
|
@@ -33,7 +33,7 @@ let AuthenticatedStripeCheckoutService = AuthenticatedStripeCheckoutService_1 =
|
|
|
33
33
|
userUuid: user.uuid,
|
|
34
34
|
organisationUuid: subscriptionRecord.organisation.uuid,
|
|
35
35
|
});
|
|
36
|
-
throw new
|
|
36
|
+
throw new ForbiddenException("You are not a member of the organisation associated with this billing account");
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
return this.stripeCheckoutService.createStripePortalSession(subscriptionRecord.paymentSystemCustomerId, parameters.returnUrl);
|
|
@@ -49,7 +49,7 @@ let AuthenticatedStripeCheckoutService = AuthenticatedStripeCheckoutService_1 =
|
|
|
49
49
|
userUuid: user.uuid,
|
|
50
50
|
organisationUuid: parameters.organisationUuid,
|
|
51
51
|
});
|
|
52
|
-
throw new
|
|
52
|
+
throw new ForbiddenException("You are not the owner of this organisation");
|
|
53
53
|
}
|
|
54
54
|
return this.stripeCheckoutService.createCheckoutSession(parameters, user);
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-stripe-checkout.service.js","sourceRoot":"","sources":["../../../src/stripe-client/services/auth-stripe-checkout.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yDAAyD;AACzD,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-stripe-checkout.service.js","sourceRoot":"","sources":["../../../src/stripe-client/services/auth-stripe-checkout.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yDAAyD;AACzD,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAMtE,OAAO,EAAC,+BAA+B,EAAC,MAAM,wEAAwE,CAAC;AACvH,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AAG5D,IAAM,kCAAkC,0CAAxC,MAAM,kCAAkC;IAKtB;IACA;IALJ,MAAM,GAAG,IAAI,MAAM,CAChC,oCAAkC,CAAC,IAAI,CAC1C,CAAC;IACF,YACqB,+BAAgE,EAChE,qBAA4C;QAD5C,oCAA+B,GAA/B,+BAA+B,CAAiC;QAChE,0BAAqB,GAArB,qBAAqB,CAAuB;IAC9D,CAAC;IAEJ,wEAAwE;IACjE,KAAK,CAAC,2BAA2B,CACpC,UAA0C,EAC1C,IAAiB;QAEjB,wEAAwE;QACxE,MAAM,kBAAkB,GACpB,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAC9C,UAAU,CAAC,sBAAsB,CACpC,CAAC;QACN,IACI,CAAC,IAAI,CAAC,WAAW;YACb,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;aACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;aAC/B,QAAQ,CAAC,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,EACrD,CAAC;YACC,CAAC;gBACG,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,+DAA+D,EAC/D;oBACI,QAAQ,EAAE,IAAI,CAAC,IAAI;oBACnB,gBAAgB,EAAE,kBAAkB,CAAC,YAAY,CAAC,IAAI;iBACzD,CACJ,CAAC;gBACF,MAAM,IAAI,kBAAkB,CACxB,+EAA+E,CAClF,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,yBAAyB,CACvD,kBAAkB,CAAC,uBAAuB,EAC1C,UAAU,CAAC,SAAS,CACvB,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAC9B,UAA2C,EAC3C,IAAiB;QAEjB,4CAA4C;QAC5C,IACI,CAAC,UAAU,CAAC,gBAAgB;YAC5B,CAAC,IAAI,CAAC,WAAW;gBACb,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;iBACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;iBAC/B,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAC5C,CAAC;YACC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,+DAA+D,EAC/D;gBACI,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;aAChD,CACJ,CAAC;YACF,MAAM,IAAI,kBAAkB,CACxB,4CAA4C,CAC/C,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CACnD,UAAU,EACV,IAAI,CACP,CAAC;IACN,CAAC;CACJ,CAAA;AAzEY,kCAAkC;IAD9C,UAAU,EAAE;qCAM6C,+BAA+B;QACzC,qBAAqB;GANxD,kCAAkC,CAyE9C"}
|
|
@@ -17,8 +17,10 @@ let SubscriptionRecordMapper = SubscriptionRecordMapper_1 = class SubscriptionRe
|
|
|
17
17
|
for (const lineItem of fullSession.line_items.data) {
|
|
18
18
|
const subscriptionFulfilmentDto = this.createFulfilmentDto(lineItem.price?.product, fullSession.customer, fullSession.customer_email, fullSession.customer_details?.email);
|
|
19
19
|
subscriptionFulfilmentDto.paymentSystemMode = this.mapPaymentType(lineItem.price?.type, fullSession.mode);
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const typedSubscription = fullSession.subscription;
|
|
21
|
+
subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, true, typedSubscription.cancel_at_period_end
|
|
22
|
+
? typedSubscription.cancel_at
|
|
23
|
+
: undefined);
|
|
22
24
|
subscriptionFulfilmentDto.paymentSystemTransactionId =
|
|
23
25
|
fullSession.mode === "subscription" ||
|
|
24
26
|
lineItem.price?.type === "recurring"
|
|
@@ -80,7 +82,9 @@ let SubscriptionRecordMapper = SubscriptionRecordMapper_1 = class SubscriptionRe
|
|
|
80
82
|
subscriptionFulfilmentDto.paymentSystemMode = "subscription";
|
|
81
83
|
subscriptionFulfilmentDto.paymentSystemTransactionId =
|
|
82
84
|
fullSubscription.id;
|
|
83
|
-
subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, additionalMeta.isActive, fullSubscription.
|
|
85
|
+
subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, additionalMeta.isActive, fullSubscription.cancel_at_period_end
|
|
86
|
+
? fullSubscription.cancel_at
|
|
87
|
+
: undefined);
|
|
84
88
|
subs.push(subscriptionFulfilmentDto);
|
|
85
89
|
}
|
|
86
90
|
return subs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptionRecord.mapper.js","sourceRoot":"","sources":["../../../src/stripe-client/services/subscriptionRecord.mapper.ts"],"names":[],"mappings":";;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAC,qCAAqC,EAAC,MAAM,mEAAmE,CAAC;AAGzG,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IACxB,MAAM,GAAG,IAAI,MAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IAE7D,6BAA6B,CAChC,WAAqD;QAErD,8DAA8D;QAC9D,6CAA6C;QAC7C,MAAM,IAAI,GAAG,EAAE,CAAC;QAEhB,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC;YAClD,MAAM,yBAAyB,GAAG,IAAI,CAAC,mBAAmB,CACtD,QAAQ,CAAC,KAAK,EAAE,OAAO,EACvB,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,gBAAgB,EAAE,KAAK,CACtC,CAAC;YAEF,yBAAyB,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAC7D,QAAQ,CAAC,KAAK,EAAE,IAAI,EACpB,WAAW,CAAC,IAAI,CACnB,CAAC;YACF,yBAAyB,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACxD,yBAAyB,CAAC,iBAAiB,EAC3C,IAAI,
|
|
1
|
+
{"version":3,"file":"subscriptionRecord.mapper.js","sourceRoot":"","sources":["../../../src/stripe-client/services/subscriptionRecord.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ 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
|
+
import { ConflictException, Injectable, Logger, NotFoundException, } from "@nestjs/common";
|
|
15
15
|
import { InjectRepository } from "@nestjs/typeorm";
|
|
16
16
|
import { Repository } from "typeorm";
|
|
17
17
|
import { Roles } from "../organisation/dto/RolesEnum.js";
|
|
@@ -113,7 +113,7 @@ let UserService = UserService_1 = class UserService {
|
|
|
113
113
|
if (!currentUser.permissions.includes("modify:all")) {
|
|
114
114
|
this.isCurrentUserGuard(uuid, currentUser.uuid, "update");
|
|
115
115
|
if (user.memberships?.some((m) => m.roles?.some((r) => r.name === Roles.owner.toString()))) {
|
|
116
|
-
throw new
|
|
116
|
+
throw new ConflictException("Can't remove the owner of an organisation. Assign a new owner first.");
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
return this.repository.softRemove(user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,10 +37,12 @@ __decorate([
|
|
|
37
37
|
], UserApiKey.prototype, "uuid", void 0);
|
|
38
38
|
__decorate([
|
|
39
39
|
ApiProperty(),
|
|
40
|
+
Column({ unique: true }),
|
|
40
41
|
__metadata("design:type", String)
|
|
41
42
|
], UserApiKey.prototype, "apiKey", void 0);
|
|
42
43
|
__decorate([
|
|
43
44
|
ApiProperty(),
|
|
45
|
+
Column(),
|
|
44
46
|
__metadata("design:type", String)
|
|
45
47
|
], UserApiKey.prototype, "description", void 0);
|
|
46
48
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userApiKey.entity.js","sourceRoot":"","sources":["../../src/user-api-key/userApiKey.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAG9C,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGnB,EAAE,CAAU;IASL,IAAI,CAAU;
|
|
1
|
+
{"version":3,"file":"userApiKey.entity.js","sourceRoot":"","sources":["../../src/user-api-key/userApiKey.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAG9C,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGnB,EAAE,CAAU;IASL,IAAI,CAAU;IAIrB,MAAM,CAAU;IAIhB,WAAW,CAAU;IAGrB,IAAI,CAAkB;IAItB,MAAM,CAAU;IAIhB,WAAW,CAAQ;IAInB,UAAU,CAAQ;CACrB,CAAA;AAjCG;IAFC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;sCACF;AASL;IAPN,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;wCACa;AAIrB;IAFC,WAAW,EAAE;IACb,MAAM,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;;0CACP;AAIhB;IAFC,WAAW,EAAE;IACb,MAAM,EAAE;;+CACY;AAGrB;IADC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;;wCACA;AAItB;IAFC,WAAW,EAAE;IACb,UAAU,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;;0CACxC;AAIhB;IAFC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;+CAAC;AAInB;IAFC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;8CAAC;AAnCT,UAAU;IADtB,MAAM,EAAE;GACI,UAAU,CAoCtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darraghor/nest-backend-libs",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.10.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",
|
|
@@ -68,87 +68,87 @@
|
|
|
68
68
|
"typeorm": "0.3.20"
|
|
69
69
|
},
|
|
70
70
|
"dependencies": {
|
|
71
|
-
"@keyv/redis": "
|
|
72
|
-
"@nestjs/axios": "4.0.
|
|
73
|
-
"@nestjs/bull": "11.0.
|
|
74
|
-
"@nestjs/cache-manager": "3.0.
|
|
75
|
-
"@nestjs/common": "11.
|
|
76
|
-
"@nestjs/config": "4.0.
|
|
77
|
-
"@nestjs/core": "11.
|
|
78
|
-
"@nestjs/microservices": "11.
|
|
71
|
+
"@keyv/redis": "5.1.4",
|
|
72
|
+
"@nestjs/axios": "4.0.1",
|
|
73
|
+
"@nestjs/bull": "11.0.4",
|
|
74
|
+
"@nestjs/cache-manager": "3.0.1",
|
|
75
|
+
"@nestjs/common": "11.1.9",
|
|
76
|
+
"@nestjs/config": "4.0.2",
|
|
77
|
+
"@nestjs/core": "11.1.9",
|
|
78
|
+
"@nestjs/microservices": "11.1.9",
|
|
79
79
|
"@nestjs/passport": "11.0.5",
|
|
80
|
-
"@nestjs/platform-express": "11.
|
|
81
|
-
"@nestjs/swagger": "11.
|
|
80
|
+
"@nestjs/platform-express": "11.1.9",
|
|
81
|
+
"@nestjs/swagger": "11.2.3",
|
|
82
82
|
"@nestjs/terminus": "11.0.0",
|
|
83
83
|
"@nestjs/typeorm": "11.0.0",
|
|
84
84
|
"add": "2.0.6",
|
|
85
|
-
"auth0": "
|
|
86
|
-
"axios": "1.
|
|
85
|
+
"auth0": "5.1.0",
|
|
86
|
+
"axios": "1.13.2",
|
|
87
87
|
"bull": "4.16.5",
|
|
88
|
-
"cache-manager": "
|
|
89
|
-
"chalk": "5.
|
|
88
|
+
"cache-manager": "7.2.5",
|
|
89
|
+
"chalk": "5.6.2",
|
|
90
90
|
"class-transformer": "0.5.1",
|
|
91
|
-
"class-validator": "0.14.
|
|
91
|
+
"class-validator": "0.14.3",
|
|
92
92
|
"date-fns": "4.1.0",
|
|
93
|
-
"dotenv": "
|
|
94
|
-
"helmet": "8.
|
|
95
|
-
"jwks-rsa": "3.
|
|
96
|
-
"nanoid": "5.1.
|
|
97
|
-
"nestjs-pino": "4.
|
|
98
|
-
"nodemailer": "
|
|
93
|
+
"dotenv": "17.2.3",
|
|
94
|
+
"helmet": "8.1.0",
|
|
95
|
+
"jwks-rsa": "3.2.0",
|
|
96
|
+
"nanoid": "5.1.6",
|
|
97
|
+
"nestjs-pino": "4.5.0",
|
|
98
|
+
"nodemailer": "7.0.11",
|
|
99
99
|
"passport": "0.7.0",
|
|
100
100
|
"passport-headerapikey": "1.2.2",
|
|
101
101
|
"passport-jwt": "4.0.1",
|
|
102
|
-
"pino-http": "
|
|
103
|
-
"pino-pretty": "13.
|
|
104
|
-
"redis": "
|
|
102
|
+
"pino-http": "11.0.0",
|
|
103
|
+
"pino-pretty": "13.1.3",
|
|
104
|
+
"redis": "5.10.0",
|
|
105
105
|
"reflect-metadata": "0.2.2",
|
|
106
|
-
"rimraf": "6.
|
|
107
|
-
"rxjs": "7.8.
|
|
108
|
-
"stripe": "
|
|
106
|
+
"rimraf": "6.1.2",
|
|
107
|
+
"rxjs": "7.8.2",
|
|
108
|
+
"stripe": "20.0.0",
|
|
109
109
|
"swagger-ui-express": "5.0.1",
|
|
110
|
-
"twitter-api-v2": "1.
|
|
111
|
-
"typeorm": "0.3.
|
|
110
|
+
"twitter-api-v2": "1.28.0",
|
|
111
|
+
"typeorm": "0.3.27"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
|
-
"@commitlint/cli": "
|
|
115
|
-
"@commitlint/config-conventional": "
|
|
116
|
-
"@darraghor/eslint-plugin-nestjs-typed": "6.
|
|
117
|
-
"@eslint/js": "9.
|
|
118
|
-
"@nestjs/cli": "11.0.
|
|
119
|
-
"@nestjs/schematics": "^11.0.
|
|
114
|
+
"@commitlint/cli": "20.1.0",
|
|
115
|
+
"@commitlint/config-conventional": "20.0.0",
|
|
116
|
+
"@darraghor/eslint-plugin-nestjs-typed": "6.4.3",
|
|
117
|
+
"@eslint/js": "9.23.0",
|
|
118
|
+
"@nestjs/cli": "11.0.5",
|
|
119
|
+
"@nestjs/schematics": "^11.0.2",
|
|
120
120
|
"@semantic-release/changelog": "6.0.3",
|
|
121
121
|
"@semantic-release/exec": "7.0.3",
|
|
122
122
|
"@types/auth0": "3.3.10",
|
|
123
|
-
"@types/express": "5.0.
|
|
123
|
+
"@types/express": "5.0.1",
|
|
124
124
|
"@types/jest": "29.5.14",
|
|
125
|
-
"@types/node": "22.13.
|
|
125
|
+
"@types/node": "22.13.14",
|
|
126
126
|
"@types/nodemailer": "6.4.17",
|
|
127
127
|
"@types/passport-jwt": "4.0.1",
|
|
128
|
-
"@types/supertest": "6.0.
|
|
128
|
+
"@types/supertest": "6.0.3",
|
|
129
129
|
"@types/yargs": "17.0.33",
|
|
130
|
-
"@typescript-eslint/eslint-plugin": "8.
|
|
131
|
-
"@typescript-eslint/parser": "8.
|
|
130
|
+
"@typescript-eslint/eslint-plugin": "8.28.0",
|
|
131
|
+
"@typescript-eslint/parser": "8.28.0",
|
|
132
132
|
"copyfiles": "2.4.1",
|
|
133
|
-
"eslint": "9.
|
|
134
|
-
"eslint-config-prettier": "10.
|
|
133
|
+
"eslint": "9.23.0",
|
|
134
|
+
"eslint-config-prettier": "10.1.1",
|
|
135
135
|
"eslint-plugin-jest": "28.11.0",
|
|
136
136
|
"eslint-plugin-sonarjs": "3.0.2",
|
|
137
|
-
"eslint-plugin-unicorn": "
|
|
138
|
-
"globals": "
|
|
137
|
+
"eslint-plugin-unicorn": "58.0.0",
|
|
138
|
+
"globals": "16.0.0",
|
|
139
139
|
"husky": "9.1.7",
|
|
140
140
|
"jest": "29.7.0",
|
|
141
141
|
"jest-create-mock-instance": "2.0.0",
|
|
142
|
-
"knip": "5.
|
|
143
|
-
"lint-staged": "15.
|
|
144
|
-
"prettier": "3.5.
|
|
142
|
+
"knip": "5.46.2",
|
|
143
|
+
"lint-staged": "15.5.0",
|
|
144
|
+
"prettier": "3.5.3",
|
|
145
145
|
"semantic-release": "24.2.3",
|
|
146
|
-
"ts-jest": "29.
|
|
146
|
+
"ts-jest": "29.3.0",
|
|
147
147
|
"ts-loader": "9.5.2",
|
|
148
148
|
"ts-node": "10.9.2",
|
|
149
149
|
"tsconfig-paths": "4.2.0",
|
|
150
|
-
"typescript": "5.
|
|
151
|
-
"typescript-eslint": "8.
|
|
150
|
+
"typescript": "5.8.2",
|
|
151
|
+
"typescript-eslint": "8.28.0",
|
|
152
152
|
"yargs": "17.7.2"
|
|
153
153
|
},
|
|
154
154
|
"lint-staged": {
|