@stamhoofd/models 2.13.0 → 2.17.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/src/factories/GroupFactory.js +13 -6
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/factories/MemberFactory.js +10 -4
- package/dist/src/factories/MemberFactory.js.map +1 -1
- package/dist/src/factories/OrganizationFactory.js +11 -6
- package/dist/src/factories/OrganizationFactory.js.map +1 -1
- package/dist/src/factories/ParentFactory.js +2 -3
- package/dist/src/factories/ParentFactory.js.map +1 -1
- package/dist/src/factories/RecordFactory.js +1 -0
- package/dist/src/factories/RecordFactory.js.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.js +2 -3
- package/dist/src/factories/RegisterCodeFactory.js.map +1 -1
- package/dist/src/factories/RegistrationFactory.js +2 -0
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/factories/UserFactory.js +15 -5
- package/dist/src/factories/UserFactory.js.map +1 -1
- package/dist/src/factories/WebshopFactory.js +7 -3
- package/dist/src/factories/WebshopFactory.js.map +1 -1
- package/dist/src/helpers/DNSValidator.js +1 -2
- package/dist/src/helpers/DNSValidator.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +23 -5
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +73 -21
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +2 -2
- package/dist/src/helpers/GroupBuilder.js.map +1 -1
- package/dist/src/helpers/Handlebars.js +3 -5
- package/dist/src/helpers/Handlebars.js.map +1 -1
- package/dist/src/helpers/InvoiceBuilder.js +11 -10
- package/dist/src/helpers/InvoiceBuilder.js.map +1 -1
- package/dist/src/helpers/MemberMerger.js +5 -5
- package/dist/src/helpers/MemberMerger.js.map +1 -1
- package/dist/src/helpers/MemberMerger.test.js +14 -27
- package/dist/src/helpers/MemberMerger.test.js.map +1 -1
- package/dist/src/helpers/RateLimiter.d.ts.map +1 -1
- package/dist/src/helpers/RateLimiter.js +10 -5
- package/dist/src/helpers/RateLimiter.js.map +1 -1
- package/dist/src/helpers/WebshopCounter.js +2 -2
- package/dist/src/helpers/WebshopCounter.js.map +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.js +10 -2
- package/dist/src/models/BalanceItem.js +41 -35
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/BalanceItemPayment.js +14 -11
- package/dist/src/models/BalanceItemPayment.js.map +1 -1
- package/dist/src/models/BuckarooPayment.js +5 -2
- package/dist/src/models/BuckarooPayment.js.map +1 -1
- package/dist/src/models/Document.js +24 -23
- package/dist/src/models/Document.js.map +1 -1
- package/dist/src/models/DocumentTemplate.js +36 -25
- package/dist/src/models/DocumentTemplate.js.map +1 -1
- package/dist/src/models/Email.d.ts.map +1 -1
- package/dist/src/models/Email.js +36 -38
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/EmailRecipient.js +15 -13
- package/dist/src/models/EmailRecipient.js.map +1 -1
- package/dist/src/models/EmailTemplate.d.ts +5 -0
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js +30 -7
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/EmailVerificationCode.js +32 -25
- package/dist/src/models/EmailVerificationCode.js.map +1 -1
- package/dist/src/models/Event.js +15 -12
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Group.js +24 -21
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Image.d.ts +0 -1
- package/dist/src/models/Image.d.ts.map +1 -1
- package/dist/src/models/Image.js +12 -14
- package/dist/src/models/Image.js.map +1 -1
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +34 -33
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +22 -16
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.js +10 -8
- package/dist/src/models/MemberResponsibilityRecord.js.map +1 -1
- package/dist/src/models/MergedMember.js +19 -14
- package/dist/src/models/MergedMember.js.map +1 -1
- package/dist/src/models/MolliePayment.js +5 -2
- package/dist/src/models/MolliePayment.js.map +1 -1
- package/dist/src/models/MollieToken.js +14 -14
- package/dist/src/models/MollieToken.js.map +1 -1
- package/dist/src/models/OneTimeToken.js +15 -13
- package/dist/src/models/OneTimeToken.js.map +1 -1
- package/dist/src/models/Order.d.ts +1 -1
- package/dist/src/models/Order.d.ts.map +1 -1
- package/dist/src/models/Order.js +42 -52
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +64 -66
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.js +8 -7
- package/dist/src/models/OrganizationRegistrationPeriod.js.map +1 -1
- package/dist/src/models/PasswordToken.js +9 -5
- package/dist/src/models/PasswordToken.js.map +1 -1
- package/dist/src/models/PayconiqPayment.js +12 -14
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +41 -35
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Platform.js +8 -10
- package/dist/src/models/Platform.js.map +1 -1
- package/dist/src/models/RegisterCode.js +12 -9
- package/dist/src/models/RegisterCode.js.map +1 -1
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +65 -80
- package/dist/src/models/Registration.js.map +1 -1
- package/dist/src/models/RegistrationPeriod.js +11 -9
- package/dist/src/models/RegistrationPeriod.js.map +1 -1
- package/dist/src/models/STCredit.js +11 -7
- package/dist/src/models/STCredit.js.map +1 -1
- package/dist/src/models/STInvoice.js +45 -45
- package/dist/src/models/STInvoice.js.map +1 -1
- package/dist/src/models/STPackage.d.ts.map +1 -1
- package/dist/src/models/STPackage.js +58 -62
- package/dist/src/models/STPackage.js.map +1 -1
- package/dist/src/models/STPendingInvoice.js +17 -16
- package/dist/src/models/STPendingInvoice.js.map +1 -1
- package/dist/src/models/StripeAccount.js +15 -14
- package/dist/src/models/StripeAccount.js.map +1 -1
- package/dist/src/models/StripeCheckoutSession.js +10 -10
- package/dist/src/models/StripeCheckoutSession.js.map +1 -1
- package/dist/src/models/StripePaymentIntent.js +10 -10
- package/dist/src/models/StripePaymentIntent.js.map +1 -1
- package/dist/src/models/Ticket.js +46 -32
- package/dist/src/models/Ticket.js.map +1 -1
- package/dist/src/models/Token.js +12 -5
- package/dist/src/models/Token.js.map +1 -1
- package/dist/src/models/UsedRegisterCode.js +15 -11
- package/dist/src/models/UsedRegisterCode.js.map +1 -1
- package/dist/src/models/User.d.ts +2 -1
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +51 -29
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/UserPermissions.js +11 -8
- package/dist/src/models/UserPermissions.js.map +1 -1
- package/dist/src/models/Webshop.js +41 -37
- package/dist/src/models/Webshop.js.map +1 -1
- package/dist/src/models/WebshopDiscountCode.js +13 -9
- package/dist/src/models/WebshopDiscountCode.js.map +1 -1
- package/dist/src/models/addresses/City.js +9 -8
- package/dist/src/models/addresses/City.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.js +7 -3
- package/dist/src/models/addresses/PostalCode.js.map +1 -1
- package/dist/src/models/addresses/Province.js +5 -2
- package/dist/src/models/addresses/Province.js.map +1 -1
- package/dist/src/models/addresses/Street.js +6 -3
- package/dist/src/models/addresses/Street.js.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.js +30 -27
- package/dist/src/structures/OrganizationServerMetaData.js.map +1 -1
- package/package.json +6 -3
- package/src/helpers/EmailBuilder.ts +95 -17
- package/src/helpers/RateLimiter.ts +1 -0
- package/src/index.ts +1 -1
- package/src/models/Email.ts +9 -11
- package/src/models/EmailTemplate.ts +20 -1
- package/src/models/Member.ts +5 -7
- package/src/models/Order.ts +11 -21
- package/src/models/Organization.ts +17 -26
- package/src/models/Payment.ts +1 -0
- package/src/models/Registration.ts +17 -45
- package/src/models/STPackage.ts +8 -16
- package/src/models/User.ts +24 -1
|
@@ -28,32 +28,50 @@ async function randomBytes(size) {
|
|
|
28
28
|
* (especially needed when clients requests all the changed tickets)
|
|
29
29
|
*/
|
|
30
30
|
class Ticket extends simple_database_1.Model {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
31
|
+
static table = "webshop_tickets";
|
|
32
|
+
// Columns
|
|
33
|
+
id;
|
|
34
|
+
/**
|
|
35
|
+
* Unique per webshop. Used for lookups
|
|
36
|
+
*/
|
|
37
|
+
secret;
|
|
38
|
+
organizationId;
|
|
39
|
+
webshopId;
|
|
40
|
+
/**
|
|
41
|
+
* Important note: access to a ticket doesn't guarantee access to an order
|
|
42
|
+
* because one person could buy 10 tickets and share them with friends.
|
|
43
|
+
* The order details should remain private to a ticket holder except for the item details
|
|
44
|
+
* + also the orderID should remain private for the holder (since this provides access via URL, need to add a secret here)
|
|
45
|
+
*/
|
|
46
|
+
orderId;
|
|
47
|
+
/**
|
|
48
|
+
* null = whole order
|
|
49
|
+
*/
|
|
50
|
+
itemId = null;
|
|
51
|
+
/**
|
|
52
|
+
* If multiple items are made for the same product, this contains the index
|
|
53
|
+
*/
|
|
54
|
+
index = 0;
|
|
55
|
+
/**
|
|
56
|
+
* total items with index
|
|
57
|
+
*/
|
|
58
|
+
total = 0;
|
|
59
|
+
/**
|
|
60
|
+
* If multiple items are made for the same product, this contains the index
|
|
61
|
+
*/
|
|
62
|
+
seat = null;
|
|
63
|
+
/**
|
|
64
|
+
* In case the seat is changed, this contains the first assigned seat
|
|
65
|
+
*/
|
|
66
|
+
originalSeat = null;
|
|
67
|
+
createdAt;
|
|
68
|
+
updatedAt;
|
|
69
|
+
deletedAt = null;
|
|
70
|
+
scannedAt = null;
|
|
71
|
+
scannedBy = null;
|
|
72
|
+
static webshop = new simple_database_1.ManyToOneRelation(_1.Webshop, "webshop");
|
|
73
|
+
static order = new simple_database_1.ManyToOneRelation(_1.Order, "order");
|
|
74
|
+
static organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
57
75
|
getUrl() {
|
|
58
76
|
return "https://" + this.webshop.getHost() + "/ticket/" + this.secret;
|
|
59
77
|
}
|
|
@@ -69,20 +87,16 @@ class Ticket extends simple_database_1.Model {
|
|
|
69
87
|
}
|
|
70
88
|
}
|
|
71
89
|
exports.Ticket = Ticket;
|
|
72
|
-
Ticket.table = "webshop_tickets";
|
|
73
|
-
Ticket.webshop = new simple_database_1.ManyToOneRelation(_1.Webshop, "webshop");
|
|
74
|
-
Ticket.order = new simple_database_1.ManyToOneRelation(_1.Order, "order");
|
|
75
|
-
Ticket.organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
76
90
|
tslib_1.__decorate([
|
|
77
91
|
(0, simple_database_1.column)({
|
|
78
92
|
primary: true, type: "string", beforeSave(value) {
|
|
79
|
-
return value
|
|
93
|
+
return value ?? (0, uuid_1.v4)();
|
|
80
94
|
}
|
|
81
95
|
})
|
|
82
96
|
], Ticket.prototype, "id", void 0);
|
|
83
97
|
tslib_1.__decorate([
|
|
84
98
|
(0, simple_database_1.column)({ type: "string", async beforeSave(value) {
|
|
85
|
-
return value
|
|
99
|
+
return value ?? bs58.encode(await randomBytes(10));
|
|
86
100
|
} })
|
|
87
101
|
], Ticket.prototype, "secret", void 0);
|
|
88
102
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Ticket.js","sourceRoot":"","sources":["../../../src/models/Ticket.ts"],"names":[],"mappings":";;;;AAAA,iEAA+E;AAC/E,sDAAyD;AACzD,4DAA2B;AAC3B,4DAA4B;AAC5B,+BAAoC;AAEpC,yBAAkD;AAElD,yDAAyD;AACzD,MAAM,QAAQ,GAAG,mCAAmC,CAAA;AACpD,MAAM,IAAI,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAA;AAE5B,KAAK,UAAU,WAAW,CAAC,IAAY;IACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAiB,EAAE,GAAW,EAAE,EAAE;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;GAIG;AACH,MAAa,MAAO,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"Ticket.js","sourceRoot":"","sources":["../../../src/models/Ticket.ts"],"names":[],"mappings":"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"}
|
package/dist/src/models/Token.js
CHANGED
|
@@ -43,11 +43,21 @@ exports.apiUserRateLimiter = new RateLimiter_1.RateLimiter({
|
|
|
43
43
|
]
|
|
44
44
|
});
|
|
45
45
|
class Token extends simple_database_1.Model {
|
|
46
|
+
static table = "tokens";
|
|
47
|
+
static MAX_DEVICES = 15;
|
|
48
|
+
userId;
|
|
49
|
+
// Columns
|
|
50
|
+
accessToken;
|
|
51
|
+
refreshToken;
|
|
52
|
+
accessTokenValidUntil;
|
|
53
|
+
refreshTokenValidUntil;
|
|
54
|
+
createdAt;
|
|
55
|
+
updatedAt;
|
|
56
|
+
static user = new simple_database_1.ManyToOneRelation(_1.User, "user");
|
|
46
57
|
isAccessTokenExpired() {
|
|
47
58
|
return this.accessTokenValidUntil < new Date() || this.refreshTokenValidUntil < new Date();
|
|
48
59
|
}
|
|
49
60
|
static async getAPIUserWithToken(user) {
|
|
50
|
-
var _a;
|
|
51
61
|
if (!user.isApiUser) {
|
|
52
62
|
throw new Error('Unexpected user type');
|
|
53
63
|
}
|
|
@@ -59,7 +69,7 @@ class Token extends simple_database_1.Model {
|
|
|
59
69
|
organizationId: user.organizationId,
|
|
60
70
|
name: user.name,
|
|
61
71
|
permissions: user.permissions,
|
|
62
|
-
expiresAt:
|
|
72
|
+
expiresAt: lastToken?.accessTokenValidUntil ?? null,
|
|
63
73
|
createdAt: user.createdAt,
|
|
64
74
|
});
|
|
65
75
|
}
|
|
@@ -176,9 +186,6 @@ class Token extends simple_database_1.Model {
|
|
|
176
186
|
}
|
|
177
187
|
}
|
|
178
188
|
exports.Token = Token;
|
|
179
|
-
Token.table = "tokens";
|
|
180
|
-
Token.MAX_DEVICES = 15;
|
|
181
|
-
Token.user = new simple_database_1.ManyToOneRelation(_1.User, "user");
|
|
182
189
|
tslib_1.__decorate([
|
|
183
190
|
(0, simple_database_1.column)({ type: "string", foreignKey: Token.user })
|
|
184
191
|
], Token.prototype, "userId", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Token.js","sourceRoot":"","sources":["../../../src/models/Token.ts"],"names":[],"mappings":";;;;AAAA,iEAAyF;AACzF,sDAAgD;AAChD,4DAA4B;AAE5B,wDAAqD;AACrD,yBAA0B;AAI1B,KAAK,UAAU,WAAW,CAAC,IAAY;IACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAiB,EAAE,GAAW,EAAE,EAAE;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAEY,QAAA,kBAAkB,GAAG,IAAI,yBAAW,CAAC;IAC9C,MAAM,EAAE;QACJ;YACI,qCAAqC;YACrC,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,CAAC,GAAG,IAAI;SACrB;QACD;YACI,yBAAyB;YACzB,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,GAAG,GAAG,IAAI;SACvB;QACD;YACI,yBAAyB;YACzB,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,EAAE,GAAG,IAAI,GAAG,EAAE;SAC3B;QACD;YACI,wBAAwB;YACxB,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;SAChC;KACJ;CACJ,CAAC,CAAC;AAEH,MAAa,KAAM,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"Token.js","sourceRoot":"","sources":["../../../src/models/Token.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,17 +10,22 @@ const _1 = require("./");
|
|
|
10
10
|
const structures_1 = require("@stamhoofd/structures");
|
|
11
11
|
const queues_1 = require("@stamhoofd/queues");
|
|
12
12
|
class UsedRegisterCode extends simple_database_1.Model {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
13
|
+
static table = "used_register_codes";
|
|
14
|
+
id;
|
|
15
|
+
code;
|
|
16
|
+
/**
|
|
17
|
+
* Code is used by...
|
|
18
|
+
*/
|
|
19
|
+
organizationId;
|
|
20
|
+
/**
|
|
21
|
+
* Set if this has been rewarded
|
|
22
|
+
*/
|
|
23
|
+
creditId = null;
|
|
24
|
+
createdAt;
|
|
25
|
+
updatedAt;
|
|
20
26
|
static async getFor(organizationId) {
|
|
21
|
-
var _a;
|
|
22
27
|
const code = await this.where({ organizationId }, { limit: 1 });
|
|
23
|
-
return
|
|
28
|
+
return code[0] ?? undefined;
|
|
24
29
|
}
|
|
25
30
|
async reward() {
|
|
26
31
|
if (this.creditId) {
|
|
@@ -116,11 +121,10 @@ class UsedRegisterCode extends simple_database_1.Model {
|
|
|
116
121
|
}
|
|
117
122
|
}
|
|
118
123
|
exports.UsedRegisterCode = UsedRegisterCode;
|
|
119
|
-
UsedRegisterCode.table = "used_register_codes";
|
|
120
124
|
tslib_1.__decorate([
|
|
121
125
|
(0, simple_database_1.column)({
|
|
122
126
|
primary: true, type: "string", beforeSave(value) {
|
|
123
|
-
return value
|
|
127
|
+
return value ?? (0, uuid_1.v4)();
|
|
124
128
|
}
|
|
125
129
|
})
|
|
126
130
|
], UsedRegisterCode.prototype, "id", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsedRegisterCode.js","sourceRoot":"","sources":["../../../src/models/UsedRegisterCode.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,4CAAyC;AACzC,gDAA+C;AAC/C,+BAAoC;AAEpC,yBAA4E;AAC5E,sDAAsD;AACtD,8CAAiD;AAEjD,MAAa,gBAAiB,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"UsedRegisterCode.js","sourceRoot":"","sources":["../../../src/models/UsedRegisterCode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ManyToOneRelation, Model } from "@simonbackx/simple-database";
|
|
2
2
|
import { EmailInterfaceRecipient } from "@stamhoofd/email";
|
|
3
|
-
import { LoginProviderType, NewUser, Permissions, UserMeta, UserPermissions, User as UserStruct } from "@stamhoofd/structures";
|
|
3
|
+
import { LoginProviderType, NewUser, Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from "@stamhoofd/structures";
|
|
4
4
|
import { Organization } from "./";
|
|
5
5
|
export declare class User extends Model {
|
|
6
6
|
static table: string;
|
|
@@ -23,6 +23,7 @@ export declare class User extends Model {
|
|
|
23
23
|
updatedAt: Date;
|
|
24
24
|
static organization: ManyToOneRelation<"organization", Organization>;
|
|
25
25
|
get name(): string | null;
|
|
26
|
+
createRecipient(...replacements: Replacement[]): Recipient;
|
|
26
27
|
static getAdmins(organizationIds: string[], options?: {
|
|
27
28
|
verified?: boolean;
|
|
28
29
|
}): Promise<User[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":"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"}
|
package/dist/src/models/User.js
CHANGED
|
@@ -8,21 +8,26 @@ const argon2_1 = tslib_1.__importDefault(require("argon2"));
|
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const _1 = require("./");
|
|
10
10
|
class User extends simple_database_1.Model {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
11
|
+
static table = "users";
|
|
12
|
+
// Columns
|
|
13
|
+
id;
|
|
14
|
+
organizationId;
|
|
15
|
+
memberId = null;
|
|
16
|
+
firstName = null;
|
|
17
|
+
lastName = null;
|
|
18
|
+
email;
|
|
19
|
+
password = null;
|
|
20
|
+
verified = false;
|
|
21
|
+
permissions = null;
|
|
22
|
+
/**
|
|
23
|
+
* @deprecated
|
|
24
|
+
* use permissions
|
|
25
|
+
*/
|
|
26
|
+
organizationPermissions = null;
|
|
27
|
+
meta = null;
|
|
28
|
+
createdAt;
|
|
29
|
+
updatedAt;
|
|
30
|
+
static organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
26
31
|
get name() {
|
|
27
32
|
if (this.firstName && this.lastName) {
|
|
28
33
|
return this.firstName + " " + this.lastName;
|
|
@@ -35,6 +40,28 @@ class User extends simple_database_1.Model {
|
|
|
35
40
|
}
|
|
36
41
|
return null;
|
|
37
42
|
}
|
|
43
|
+
createRecipient(...replacements) {
|
|
44
|
+
return structures_1.Recipient.create({
|
|
45
|
+
firstName: this.firstName,
|
|
46
|
+
lastName: this.lastName,
|
|
47
|
+
email: this.email,
|
|
48
|
+
replacements: [
|
|
49
|
+
...replacements,
|
|
50
|
+
structures_1.Replacement.create({
|
|
51
|
+
token: 'firstName',
|
|
52
|
+
value: this.firstName ?? ''
|
|
53
|
+
}),
|
|
54
|
+
structures_1.Replacement.create({
|
|
55
|
+
token: 'lastName',
|
|
56
|
+
value: this.lastName ?? ''
|
|
57
|
+
}),
|
|
58
|
+
structures_1.Replacement.create({
|
|
59
|
+
token: 'email',
|
|
60
|
+
value: this.email
|
|
61
|
+
})
|
|
62
|
+
]
|
|
63
|
+
});
|
|
64
|
+
}
|
|
38
65
|
static async getAdmins(organizationIds, options) {
|
|
39
66
|
if (organizationIds.length == 0) {
|
|
40
67
|
return [];
|
|
@@ -42,7 +69,7 @@ class User extends simple_database_1.Model {
|
|
|
42
69
|
if (STAMHOOFD.userMode === 'platform') {
|
|
43
70
|
// Custom implementation
|
|
44
71
|
let global = (await User.where({ organizationId: null, permissions: { sign: "!=", value: null } }));
|
|
45
|
-
global = global.filter(u => organizationIds.find(organizationId =>
|
|
72
|
+
global = global.filter(u => organizationIds.find(organizationId => u.permissions?.organizationPermissions.has(organizationId)));
|
|
46
73
|
// Hide api accounts
|
|
47
74
|
global = global.filter(a => !a.isApiUser);
|
|
48
75
|
return global;
|
|
@@ -51,7 +78,7 @@ class User extends simple_database_1.Model {
|
|
|
51
78
|
permissions: { sign: "!=", value: null },
|
|
52
79
|
organizationId: { sign: 'IN', value: organizationIds },
|
|
53
80
|
};
|
|
54
|
-
if (
|
|
81
|
+
if (options?.verified !== undefined) {
|
|
55
82
|
query.verified = options.verified;
|
|
56
83
|
}
|
|
57
84
|
return (await User.where(query)).filter(a => !a.isApiUser);
|
|
@@ -135,11 +162,10 @@ class User extends simple_database_1.Model {
|
|
|
135
162
|
return !this.email.includes('@') && this.email.endsWith('.api') && this.verified;
|
|
136
163
|
}
|
|
137
164
|
hasAccount() {
|
|
138
|
-
var _a, _b, _c;
|
|
139
165
|
if (this.hasPasswordBasedAccount()) {
|
|
140
166
|
return true;
|
|
141
167
|
}
|
|
142
|
-
if ((
|
|
168
|
+
if ((this.meta?.loginProviderIds?.size ?? 0) > 0) {
|
|
143
169
|
return true;
|
|
144
170
|
}
|
|
145
171
|
if (this.isApiUser) {
|
|
@@ -201,13 +227,12 @@ class User extends simple_database_1.Model {
|
|
|
201
227
|
return hash;
|
|
202
228
|
}
|
|
203
229
|
static async createInvited(organization, data) {
|
|
204
|
-
var _a;
|
|
205
230
|
const { email, firstName, lastName } = data;
|
|
206
231
|
if (!organization && STAMHOOFD.userMode !== 'platform' && !data.allowPlatform) {
|
|
207
232
|
throw new Error("Missing organization");
|
|
208
233
|
}
|
|
209
234
|
const user = new User();
|
|
210
|
-
user.organizationId = STAMHOOFD.userMode === 'platform' ? null : (
|
|
235
|
+
user.organizationId = STAMHOOFD.userMode === 'platform' ? null : (organization?.id ?? null);
|
|
211
236
|
user.id = (0, uuid_1.v4)();
|
|
212
237
|
user.email = email;
|
|
213
238
|
user.verified = false;
|
|
@@ -226,7 +251,6 @@ class User extends simple_database_1.Model {
|
|
|
226
251
|
return user;
|
|
227
252
|
}
|
|
228
253
|
static async register(organization, data) {
|
|
229
|
-
var _a, _b;
|
|
230
254
|
const { email, password, id, firstName, lastName } = data;
|
|
231
255
|
if (!password) {
|
|
232
256
|
throw new Error("A password is required for new users");
|
|
@@ -234,13 +258,13 @@ class User extends simple_database_1.Model {
|
|
|
234
258
|
if (!organization && STAMHOOFD.userMode !== 'platform') {
|
|
235
259
|
throw new Error("Missing organization");
|
|
236
260
|
}
|
|
237
|
-
if (await User.getForAuthentication(
|
|
261
|
+
if (await User.getForAuthentication(organization?.id ?? null, email, { allowWithoutAccount: true })) {
|
|
238
262
|
// Already exists
|
|
239
263
|
return;
|
|
240
264
|
}
|
|
241
265
|
const user = new User();
|
|
242
|
-
user.organizationId = STAMHOOFD.userMode === 'platform' ? null : (
|
|
243
|
-
user.id = id
|
|
266
|
+
user.organizationId = STAMHOOFD.userMode === 'platform' ? null : (organization?.id ?? null);
|
|
267
|
+
user.id = id ?? (0, uuid_1.v4)();
|
|
244
268
|
user.email = email;
|
|
245
269
|
user.password = await this.hash(password);
|
|
246
270
|
user.verified = false;
|
|
@@ -274,7 +298,7 @@ class User extends simple_database_1.Model {
|
|
|
274
298
|
}
|
|
275
299
|
const user = new User();
|
|
276
300
|
user.organizationId = organization.id;
|
|
277
|
-
user.id = id
|
|
301
|
+
user.id = id ?? (0, uuid_1.v4)();
|
|
278
302
|
user.email = email;
|
|
279
303
|
user.verified = false;
|
|
280
304
|
user.firstName = firstName;
|
|
@@ -318,12 +342,10 @@ class User extends simple_database_1.Model {
|
|
|
318
342
|
}
|
|
319
343
|
}
|
|
320
344
|
exports.User = User;
|
|
321
|
-
User.table = "users";
|
|
322
|
-
User.organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
323
345
|
tslib_1.__decorate([
|
|
324
346
|
(0, simple_database_1.column)({
|
|
325
347
|
primary: true, type: "string", beforeSave(value) {
|
|
326
|
-
return value
|
|
348
|
+
return value ?? (0, uuid_1.v4)();
|
|
327
349
|
}
|
|
328
350
|
})
|
|
329
351
|
], User.prototype, "id", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":";;;;AACA,iEAAyF;AAEzF,sDAAuJ;AACvJ,4DAA4B;AAC5B,+BAAoC;AAEpC,yBAAkC;AAElC,MAAa,IAAK,SAAQ,uBAAK;IAC3B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;IAEvB,UAAU;IAMV,EAAE,CAAU;IAGZ,cAAc,CAAc;IAG5B,QAAQ,GAAgB,IAAI,CAAA;IAG5B,SAAS,GAAkB,IAAI,CAAC;IAGhC,QAAQ,GAAkB,IAAI,CAAC;IAG/B,KAAK,CAAS;IAGd,QAAQ,GAAkB,IAAI,CAAC;IAG/B,QAAQ,GAAG,KAAK,CAAA;IAGhB,WAAW,GAA2B,IAAI,CAAA;IAE1C;;;OAGG;IAEH,uBAAuB,GAAuB,IAAI,CAAA;IAGlD,IAAI,GAAoB,IAAI,CAAA;IAY5B,SAAS,CAAM;IAUf,SAAS,CAAM;IAEf,MAAM,CAAC,YAAY,GAAG,IAAI,mCAAiB,CAAC,eAAY,EAAE,cAAc,CAAC,CAAC;IAE1E,IAAI,IAAI;QACJ,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChD,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,GAAG,YAA2B;QAC1C,OAAO,sBAAS,CAAC,MAAM,CAAC;YACpB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE;gBACV,GAAG,YAAY;gBACf,wBAAW,CAAC,MAAM,CAAC;oBACf,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;iBAC9B,CAAC;gBACF,wBAAW,CAAC,MAAM,CAAC;oBACf,KAAK,EAAE,UAAU;oBACjB,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;iBAC7B,CAAC;gBACF,wBAAW,CAAC,MAAM,CAAC;oBACf,KAAK,EAAE,OAAO;oBACd,KAAK,EAAE,IAAI,CAAC,KAAK;iBACpB,CAAC;aACL;SACJ,CAAC,CAAA;IACN,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,eAAyB,EAAE,OAA8B;QAC5E,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAA;QACb,CAAC;QAED,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACpC,wBAAwB;YACxB,IAAI,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAC,CAAC,CAAC,CAAA;YAClG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;YAE/H,oBAAoB;YACpB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAEzC,OAAO,MAAM,CAAA;QACjB,CAAC;QAED,MAAM,KAAK,GAAQ;YACf,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;YACxC,cAAc,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAC;SACvD,CAAC;QAEF,IAAI,OAAO,EAAE,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QACrC,CAAC;QAED,OAAO,CACH,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAC1B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,eAAyB;QAC9C,OAAO,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAC,EAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3L,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAW;QACnB,IAAI,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC;YACrB,kCAAkC;YAClC,IAAI,IAAI,CAAC,uBAAuB,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;gBAChE,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,IAAI,CAAC,uBAAuB,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;oBACjE,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC,uBAAuB,CAAC;gBACjE,CAAC;YACL,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAElB,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YACnC,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,gEAAa,UAAU,GAAC,CAAC,CAAC,MAAM,CAAA;QAEhD,wDAAwD;QACxD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAA;QAErE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAC,KAAK,CAAC,EAAE,GAAC,MAAM,GAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAChE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC7D,CAAC;QAED,uBAAuB;QACvB,MAAM,KAAK,GAAG,sDAAsD,CAAA;QACpE,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;QAEjD,kBAAkB;QAClB,MAAM,MAAM,GAAG,iDAAiD,CAAA;QAChE,MAAM,0BAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;QAElD,gBAAgB;QAChB,MAAM,MAAM,GAAG,uDAAuD,CAAA;QACtE,MAAM,0BAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;QAElD,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;IACxB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,cAA2B,EAAE,KAAa,EAAE,QAAgB;QAC3E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QACnE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7C,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;YAC1C,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;gBAC3B,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAA;YAC/D,OAAM;QACV,CAAC;QAED,IAAI,CAAC;YACD,IAAI,MAAM,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/C,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,mBAAmB;YACnB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACpB,CAAC;IACL,CAAC;IAED,wCAAwC;IACxC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,QAAgB;QAChD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,yCAAyC,IAAI,CAAC,KAAK,iDAAiD,IAAI,CAAC,KAAK,gHAAgH,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxT,OAAO,IAAI,CAAA;IACf,CAAC;IAED,uBAAuB;QACnB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,IAAI,SAAS;QACT,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAA;IACpF,CAAC;IAED,UAAU;QACN,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAES,OAAO;QACb,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,kDAAkD;YAClD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,cAA2B,EAAE,KAAa;QAClE,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,KAAK,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAC,CAAC,CAAA;IAC9F,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,cAAsB,EAAE,KAAa;QACvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC3B,KAAK;YACL,cAAc,EAAE,cAAc;SACjC,EAAE;YACC,KAAK,EAAE,CAAC;SACX,CAAC,CAAA;QAEF,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAErB,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,cAA2B,EAAE,KAAa,EAAE,EAAC,mBAAmB,GAAG,KAAK,KAAqC,EAAE;QAC7I,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC3B,KAAK;YACL,cAAc,EAAE,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc;SAC5E,EAAE;YACC,KAAK,EAAE,CAAC;SACX,CAAC,CAAA;QAEF,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACpB,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAC1D,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAC,mBAAmB,EAAC,CAAC,CAAA;YACxE,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAErB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrD,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAC1D,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAC,mBAAmB,EAAC,CAAC,CAAA;YACxE,CAAC;YACD,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,uCAAuC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAgB;QAC9B,MAAM,IAAI,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,gBAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CACtB,YAA+B,EAC/B,IAA6F;QAE7F,MAAM,EACF,KAAK,EACL,SAAS,EACT,QAAQ,EACX,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5E,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI,CAAC,CAAA;QAC3F,IAAI,CAAC,EAAE,GAAG,IAAA,SAAM,GAAE,CAAA;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAExB,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,yBAAyB;YACzB,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;gBACrC,OAAO;YACX,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CACjB,YAA+B,EAC/B,IAAa;QAEb,MAAM,EACF,KAAK,EACL,QAAQ,EACR,EAAE,EACF,SAAS,EACT,QAAQ,EACX,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAC3C,CAAC;QAED,IAAI,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI,EAAE,KAAK,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAC,CAAC,EAAE,CAAC;YAChG,iBAAiB;YACjB,OAAO;QACX,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI,CAAC,CAAA;QAC3F,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,IAAA,SAAM,GAAE,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAExB,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,yBAAyB;YACzB,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;gBACrC,OAAO;YACX,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,IAAuB,EAAE,GAAW;QAClD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,GAAG,qBAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACnC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CACpB,YAA+B,EAC/B,IAA4E;QAE5E,MAAM,EACF,KAAK,EACL,EAAE,EACF,SAAS,EACT,QAAQ,EACX,GAAG,IAAI,CAAC;QAET,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;QACrC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,IAAA,SAAM,GAAE,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QAE3C,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,yBAAyB;YACzB,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;gBACrC,OAAO;YACX,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAgB;QACjC,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC;IAED,YAAY;QACR,OAAO,iBAAU,CAAC,MAAM,CAAC;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAC,CAAC;IACP,CAAC;IAED,UAAU;QACN,OAAO;YACJ;gBACK,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;aAClB;SACJ,CAAA;IACL,CAAC;;AAldL,oBAodC;AA3cG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;gCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4CAC9C;AAG5B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACf;AAG5B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;uCACX;AAGhC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACZ;AAG/B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mCACb;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACZ;AAG/B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;sCACZ;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,4BAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;yCACzB;AAO1C;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qDACb;AAGlD;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kCAChC;AAY5B;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;KACJ,CAAC;uCACa;AAUf;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;uCACa"}
|
|
@@ -7,19 +7,22 @@ const structures_1 = require("@stamhoofd/structures");
|
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const _1 = require("./");
|
|
9
9
|
class UserPermissions extends simple_database_1.Model {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
static table = "user_permissions";
|
|
11
|
+
// Columns
|
|
12
|
+
id;
|
|
13
|
+
organizationId;
|
|
14
|
+
userId;
|
|
15
|
+
permissions = null;
|
|
16
|
+
createdAt;
|
|
17
|
+
updatedAt;
|
|
18
|
+
static organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
19
|
+
static user = new simple_database_1.ManyToOneRelation(_1.User, "user");
|
|
14
20
|
}
|
|
15
21
|
exports.UserPermissions = UserPermissions;
|
|
16
|
-
UserPermissions.table = "user_permissions";
|
|
17
|
-
UserPermissions.organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
|
|
18
|
-
UserPermissions.user = new simple_database_1.ManyToOneRelation(_1.User, "user");
|
|
19
22
|
tslib_1.__decorate([
|
|
20
23
|
(0, simple_database_1.column)({
|
|
21
24
|
primary: true, type: "string", beforeSave(value) {
|
|
22
|
-
return value
|
|
25
|
+
return value ?? (0, uuid_1.v4)();
|
|
23
26
|
}
|
|
24
27
|
})
|
|
25
28
|
], UserPermissions.prototype, "id", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserPermissions.js","sourceRoot":"","sources":["../../../src/models/UserPermissions.ts"],"names":[],"mappings":";;;;AACA,iEAA+E;AAC/E,sDAAoD;AACpD,+BAAoC;AAEpC,yBAAwC;AAExC,MAAa,eAAgB,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"UserPermissions.js","sourceRoot":"","sources":["../../../src/models/UserPermissions.ts"],"names":[],"mappings":";;;;AACA,iEAA+E;AAC/E,sDAAoD;AACpD,+BAAoC;AAEpC,yBAAwC;AAExC,MAAa,eAAgB,SAAQ,uBAAK;IACtC,MAAM,CAAC,KAAK,GAAG,kBAAkB,CAAC;IAElC,UAAU;IAMV,EAAE,CAAU;IAGZ,cAAc,CAAS;IAGvB,MAAM,CAAS;IAGf,WAAW,GAAuB,IAAI,CAAA;IAYtC,SAAS,CAAM;IAUf,SAAS,CAAM;IAEf,MAAM,CAAC,YAAY,GAAG,IAAI,mCAAiB,CAAC,eAAY,EAAE,cAAc,CAAC,CAAC;IAC1E,MAAM,CAAC,IAAI,GAAG,IAAI,mCAAiB,CAAC,OAAI,EAAE,MAAM,CAAC,CAAC;;AA3CtD,0CA8CC;AArCG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;2CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,UAAU,EAAE,eAAe,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;uDAC9C;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,UAAU,EAAE,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;+CAC9C;AAGf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;oDACzB;AAYtC;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;KACJ,CAAC;kDACa;AAUf;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;kDACa"}
|