@stamhoofd/models 2.39.0 → 2.40.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/AddressFactory.d.ts +3 -4
- package/dist/src/factories/AddressFactory.d.ts.map +1 -1
- package/dist/src/factories/AddressFactory.js +13 -13
- package/dist/src/factories/EmergencyContactFactory.d.ts +3 -4
- package/dist/src/factories/EmergencyContactFactory.d.ts.map +1 -1
- package/dist/src/factories/EmergencyContactFactory.js +27 -27
- package/dist/src/factories/EmergencyContactFactory.js.map +1 -1
- package/dist/src/factories/GroupFactory.d.ts +4 -4
- package/dist/src/factories/GroupFactory.d.ts.map +1 -1
- package/dist/src/factories/GroupFactory.js +8 -8
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/factories/MemberFactory.d.ts +4 -4
- package/dist/src/factories/MemberFactory.d.ts.map +1 -1
- package/dist/src/factories/MemberFactory.js +17 -17
- package/dist/src/factories/MemberFactory.js.map +1 -1
- package/dist/src/factories/OrganizationFactory.d.ts +4 -4
- package/dist/src/factories/OrganizationFactory.js +8 -8
- package/dist/src/factories/OrganizationFactory.js.map +1 -1
- package/dist/src/factories/ParentFactory.d.ts +1 -1
- package/dist/src/factories/ParentFactory.js +19 -19
- package/dist/src/factories/ParentFactory.js.map +1 -1
- package/dist/src/factories/RecordFactory.d.ts +2 -3
- package/dist/src/factories/RecordFactory.d.ts.map +1 -1
- package/dist/src/factories/RecordFactory.js +1 -1
- package/dist/src/factories/RecordFactory.js.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.d.ts +2 -2
- package/dist/src/factories/RegisterCodeFactory.d.ts.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.js +2 -2
- package/dist/src/factories/RegistrationFactory.d.ts +3 -3
- package/dist/src/factories/RegistrationFactory.d.ts.map +1 -1
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/factories/RegistrationPeriodFactory.d.ts +2 -2
- package/dist/src/factories/RegistrationPeriodFactory.js.map +1 -1
- package/dist/src/factories/UserFactory.d.ts +3 -3
- package/dist/src/factories/UserFactory.d.ts.map +1 -1
- package/dist/src/factories/UserFactory.js +3 -3
- package/dist/src/factories/UserFactory.js.map +1 -1
- package/dist/src/factories/WebshopFactory.d.ts +4 -4
- package/dist/src/factories/WebshopFactory.d.ts.map +1 -1
- package/dist/src/factories/WebshopFactory.js +1 -1
- package/dist/src/factories/WebshopFactory.js.map +1 -1
- package/dist/src/helpers/DNSValidator.d.ts +1 -1
- package/dist/src/helpers/DNSValidator.d.ts.map +1 -1
- package/dist/src/helpers/DNSValidator.js +33 -33
- package/dist/src/helpers/DNSValidator.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +10 -10
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +34 -34
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.d.ts.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +57 -57
- package/dist/src/helpers/GroupBuilder.js.map +1 -1
- package/dist/src/helpers/Handlebars.d.ts.map +1 -1
- package/dist/src/helpers/Handlebars.js +29 -29
- package/dist/src/helpers/Handlebars.js.map +1 -1
- package/dist/src/helpers/MemberMerger.d.ts +1 -1
- package/dist/src/helpers/MemberMerger.d.ts.map +1 -1
- package/dist/src/helpers/MemberMerger.js +33 -33
- package/dist/src/helpers/MemberMerger.js.map +1 -1
- package/dist/src/helpers/MemberMerger.test.js +194 -194
- 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 +2 -2
- package/dist/src/helpers/RateLimiter.js.map +1 -1
- package/dist/src/helpers/SetupStepsUpdater.d.ts +22 -0
- package/dist/src/helpers/SetupStepsUpdater.d.ts.map +1 -0
- package/dist/src/helpers/SetupStepsUpdater.js +255 -0
- package/dist/src/helpers/SetupStepsUpdater.js.map +1 -0
- package/dist/src/helpers/WebshopCounter.d.ts +1 -1
- package/dist/src/helpers/WebshopCounter.d.ts.map +1 -1
- package/dist/src/helpers/WebshopCounter.js +1 -1
- package/dist/src/helpers/WebshopCounter.js.map +1 -1
- package/dist/src/helpers/WebshopCounter.test.js +6 -6
- package/dist/src/helpers/WebshopCounter.test.js.map +1 -1
- package/dist/src/index.d.ts +20 -19
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.js +12 -12
- package/dist/src/migrations/1605262046-import-postcodes-nl.js +10 -10
- package/dist/src/models/BalanceItem.d.ts.map +1 -1
- package/dist/src/models/BalanceItem.js +37 -37
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/BalanceItemPayment.d.ts.map +1 -1
- package/dist/src/models/BalanceItemPayment.js +13 -13
- package/dist/src/models/BalanceItemPayment.js.map +1 -1
- package/dist/src/models/BuckarooPayment.d.ts +1 -1
- package/dist/src/models/BuckarooPayment.d.ts.map +1 -1
- package/dist/src/models/BuckarooPayment.js +5 -5
- package/dist/src/models/BuckarooPayment.js.map +1 -1
- package/dist/src/models/CachedOutstandingBalance.d.ts.map +1 -1
- package/dist/src/models/CachedOutstandingBalance.js +37 -37
- package/dist/src/models/CachedOutstandingBalance.js.map +1 -1
- package/dist/src/models/Document.d.ts +4 -4
- package/dist/src/models/Document.d.ts.map +1 -1
- package/dist/src/models/Document.js +27 -27
- package/dist/src/models/Document.js.map +1 -1
- package/dist/src/models/DocumentTemplate.d.ts +4 -4
- package/dist/src/models/DocumentTemplate.d.ts.map +1 -1
- package/dist/src/models/DocumentTemplate.js +72 -72
- 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 +63 -64
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/EmailRecipient.d.ts.map +1 -1
- package/dist/src/models/EmailRecipient.js +20 -20
- package/dist/src/models/EmailRecipient.js.map +1 -1
- package/dist/src/models/EmailTemplate.d.ts +3 -3
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js +16 -16
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/EmailVerificationCode.d.ts +2 -2
- package/dist/src/models/EmailVerificationCode.d.ts.map +1 -1
- package/dist/src/models/EmailVerificationCode.js +57 -55
- package/dist/src/models/EmailVerificationCode.js.map +1 -1
- package/dist/src/models/Event.d.ts +2 -2
- package/dist/src/models/Event.d.ts.map +1 -1
- package/dist/src/models/Event.js +15 -15
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Group.d.ts +3 -1
- package/dist/src/models/Group.d.ts.map +1 -1
- package/dist/src/models/Group.js +46 -35
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Image.d.ts +1 -1
- package/dist/src/models/Image.d.ts.map +1 -1
- package/dist/src/models/Image.js +26 -26
- package/dist/src/models/Image.js.map +1 -1
- package/dist/src/models/Member.d.ts +8 -8
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +60 -60
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.d.ts +3 -3
- package/dist/src/models/MemberPlatformMembership.d.ts.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +26 -26
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.d.ts.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.js +13 -13
- package/dist/src/models/MemberResponsibilityRecord.js.map +1 -1
- package/dist/src/models/MergedMember.d.ts +3 -3
- package/dist/src/models/MergedMember.d.ts.map +1 -1
- package/dist/src/models/MergedMember.js +19 -19
- package/dist/src/models/MergedMember.js.map +1 -1
- package/dist/src/models/MolliePayment.d.ts +1 -1
- package/dist/src/models/MolliePayment.d.ts.map +1 -1
- package/dist/src/models/MolliePayment.js +5 -5
- package/dist/src/models/MolliePayment.js.map +1 -1
- package/dist/src/models/MollieToken.d.ts.map +1 -1
- package/dist/src/models/MollieToken.js +60 -60
- package/dist/src/models/MollieToken.js.map +1 -1
- package/dist/src/models/OneTimeToken.d.ts +2 -2
- package/dist/src/models/OneTimeToken.d.ts.map +1 -1
- package/dist/src/models/OneTimeToken.js +13 -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 +70 -70
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Organization.d.ts +5 -5
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +127 -127
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.js +15 -15
- package/dist/src/models/OrganizationRegistrationPeriod.js.map +1 -1
- package/dist/src/models/PasswordToken.d.ts +3 -3
- package/dist/src/models/PasswordToken.d.ts.map +1 -1
- package/dist/src/models/PasswordToken.js +17 -17
- package/dist/src/models/PasswordToken.js.map +1 -1
- package/dist/src/models/PayconiqPayment.d.ts +1 -1
- package/dist/src/models/PayconiqPayment.d.ts.map +1 -1
- package/dist/src/models/PayconiqPayment.js +49 -49
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/dist/src/models/Payment.d.ts +3 -3
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +36 -36
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Platform.d.ts +2 -2
- package/dist/src/models/Platform.d.ts.map +1 -1
- package/dist/src/models/Platform.js +8 -8
- package/dist/src/models/Platform.js.map +1 -1
- package/dist/src/models/RegisterCode.d.ts +1 -1
- package/dist/src/models/RegisterCode.d.ts.map +1 -1
- package/dist/src/models/RegisterCode.js +11 -11
- package/dist/src/models/RegisterCode.js.map +1 -1
- package/dist/src/models/Registration.d.ts +1 -1
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +88 -88
- package/dist/src/models/Registration.js.map +1 -1
- package/dist/src/models/RegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/RegistrationPeriod.js +12 -12
- package/dist/src/models/RegistrationPeriod.js.map +1 -1
- package/dist/src/models/STCredit.d.ts +1 -1
- package/dist/src/models/STCredit.d.ts.map +1 -1
- package/dist/src/models/STCredit.js +12 -12
- package/dist/src/models/STCredit.js.map +1 -1
- package/dist/src/models/STInvoice.d.ts +1 -1
- package/dist/src/models/STInvoice.d.ts.map +1 -1
- package/dist/src/models/STInvoice.js +16 -16
- package/dist/src/models/STInvoice.js.map +1 -1
- package/dist/src/models/STPackage.d.ts +1 -1
- package/dist/src/models/STPackage.d.ts.map +1 -1
- package/dist/src/models/STPackage.js +39 -39
- package/dist/src/models/STPackage.js.map +1 -1
- package/dist/src/models/STPendingInvoice.d.ts +1 -1
- package/dist/src/models/STPendingInvoice.d.ts.map +1 -1
- package/dist/src/models/STPendingInvoice.js +11 -11
- package/dist/src/models/STPendingInvoice.js.map +1 -1
- package/dist/src/models/StripeAccount.d.ts.map +1 -1
- package/dist/src/models/StripeAccount.js +13 -13
- package/dist/src/models/StripeAccount.js.map +1 -1
- package/dist/src/models/StripeCheckoutSession.d.ts +1 -1
- package/dist/src/models/StripeCheckoutSession.d.ts.map +1 -1
- package/dist/src/models/StripeCheckoutSession.js +7 -7
- package/dist/src/models/StripeCheckoutSession.js.map +1 -1
- package/dist/src/models/StripePaymentIntent.d.ts +1 -1
- package/dist/src/models/StripePaymentIntent.d.ts.map +1 -1
- package/dist/src/models/StripePaymentIntent.js +7 -7
- package/dist/src/models/StripePaymentIntent.js.map +1 -1
- package/dist/src/models/Ticket.d.ts +2 -2
- package/dist/src/models/Ticket.d.ts.map +1 -1
- package/dist/src/models/Ticket.js +23 -23
- package/dist/src/models/Ticket.js.map +1 -1
- package/dist/src/models/Token.d.ts +3 -3
- package/dist/src/models/Token.d.ts.map +1 -1
- package/dist/src/models/Token.js +27 -27
- package/dist/src/models/Token.js.map +1 -1
- package/dist/src/models/Token.test.js +11 -11
- package/dist/src/models/UsedRegisterCode.d.ts +1 -1
- package/dist/src/models/UsedRegisterCode.d.ts.map +1 -1
- package/dist/src/models/UsedRegisterCode.js +10 -10
- package/dist/src/models/UsedRegisterCode.js.map +1 -1
- package/dist/src/models/User.d.ts +4 -4
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +53 -51
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/UserPermissions.d.ts +3 -3
- package/dist/src/models/UserPermissions.d.ts.map +1 -1
- package/dist/src/models/UserPermissions.js +12 -12
- package/dist/src/models/UserPermissions.js.map +1 -1
- package/dist/src/models/Webshop.d.ts +1 -1
- package/dist/src/models/Webshop.d.ts.map +1 -1
- package/dist/src/models/Webshop.js +23 -23
- package/dist/src/models/Webshop.js.map +1 -1
- package/dist/src/models/WebshopDiscountCode.d.ts +1 -1
- package/dist/src/models/WebshopDiscountCode.d.ts.map +1 -1
- package/dist/src/models/WebshopDiscountCode.js +16 -16
- package/dist/src/models/WebshopDiscountCode.js.map +1 -1
- package/dist/src/models/addresses/City.d.ts.map +1 -1
- package/dist/src/models/addresses/City.js +9 -9
- package/dist/src/models/addresses/City.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.d.ts.map +1 -1
- package/dist/src/models/addresses/PostalCode.js +11 -11
- package/dist/src/models/addresses/PostalCode.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.test.js +22 -22
- package/dist/src/models/addresses/PostalCode.test.js.map +1 -1
- package/dist/src/models/addresses/Province.d.ts.map +1 -1
- package/dist/src/models/addresses/Province.js +5 -5
- package/dist/src/models/addresses/Province.js.map +1 -1
- package/dist/src/models/addresses/Street.d.ts.map +1 -1
- package/dist/src/models/addresses/Street.js +6 -6
- package/dist/src/models/addresses/Street.js.map +1 -1
- package/dist/src/models/index.d.ts +46 -46
- package/dist/src/models/index.d.ts.map +1 -1
- package/dist/src/models/index.js +0 -1
- package/dist/src/models/index.js.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.d.ts.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.js +4 -4
- package/dist/src/structures/OrganizationServerMetaData.js.map +1 -1
- package/dist/tests/jest.global.setup.d.ts.map +1 -1
- package/dist/tests/jest.global.setup.js +15 -13
- package/dist/tests/jest.global.setup.js.map +1 -1
- package/dist/tests/jest.setup.js +3 -1
- package/dist/tests/jest.setup.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +3 -3
- package/src/factories/AddressFactory.ts +17 -17
- package/src/factories/EmergencyContactFactory.ts +30 -31
- package/src/factories/GroupFactory.ts +30 -30
- package/src/factories/MemberFactory.ts +41 -38
- package/src/factories/OrganizationFactory.ts +15 -15
- package/src/factories/ParentFactory.ts +24 -24
- package/src/factories/RecordFactory.ts +5 -4
- package/src/factories/RegisterCodeFactory.ts +7 -7
- package/src/factories/RegistrationFactory.ts +16 -16
- package/src/factories/RegistrationPeriodFactory.ts +5 -5
- package/src/factories/UserFactory.ts +20 -19
- package/src/factories/WebshopFactory.ts +14 -14
- package/src/helpers/DNSValidator.ts +89 -84
- package/src/helpers/EmailBuilder.ts +141 -135
- package/src/helpers/GroupBuilder.ts +181 -181
- package/src/helpers/Handlebars.ts +57 -54
- package/src/helpers/MemberMerger.test.ts +702 -702
- package/src/helpers/MemberMerger.ts +83 -77
- package/src/helpers/RateLimiter.ts +25 -27
- package/src/helpers/SetupStepsUpdater.ts +402 -0
- package/src/helpers/WebshopCounter.test.ts +12 -12
- package/src/helpers/WebshopCounter.ts +20 -19
- package/src/index.ts +20 -19
- package/src/migrations/1605262045-import-postcodes.ts +59 -63
- package/src/migrations/1605262046-import-postcodes-nl.ts +41 -43
- package/src/models/BalanceItem.ts +173 -172
- package/src/models/BalanceItemPayment.ts +32 -33
- package/src/models/BuckarooPayment.ts +7 -7
- package/src/models/CachedOutstandingBalance.ts +98 -99
- package/src/models/Document.ts +90 -87
- package/src/models/DocumentTemplate.ts +207 -198
- package/src/models/Email.ts +198 -200
- package/src/models/EmailRecipient.ts +38 -39
- package/src/models/EmailTemplate.ts +36 -37
- package/src/models/EmailVerificationCode.ts +146 -142
- package/src/models/Event.ts +53 -53
- package/src/models/Group.ts +136 -123
- package/src/models/Image.ts +48 -48
- package/src/models/Member.ts +277 -275
- package/src/models/MemberPlatformMembership.ts +71 -71
- package/src/models/MemberResponsibilityRecord.ts +32 -32
- package/src/models/MergedMember.ts +77 -77
- package/src/models/MolliePayment.ts +7 -7
- package/src/models/MollieToken.ts +131 -126
- package/src/models/OneTimeToken.ts +40 -39
- package/src/models/Order.ts +379 -372
- package/src/models/Organization.ts +332 -325
- package/src/models/OrganizationRegistrationPeriod.ts +50 -50
- package/src/models/PasswordToken.ts +42 -42
- package/src/models/PayconiqPayment.ts +80 -76
- package/src/models/Payment.ts +86 -86
- package/src/models/Platform.ts +21 -22
- package/src/models/RegisterCode.ts +26 -26
- package/src/models/Registration.ts +167 -168
- package/src/models/RegistrationPeriod.ts +29 -29
- package/src/models/STCredit.ts +24 -25
- package/src/models/STInvoice.ts +34 -34
- package/src/models/STPackage.ts +143 -136
- package/src/models/STPendingInvoice.ts +26 -26
- package/src/models/StripeAccount.ts +27 -27
- package/src/models/StripeCheckoutSession.ts +10 -10
- package/src/models/StripePaymentIntent.ts +10 -10
- package/src/models/Ticket.ts +51 -52
- package/src/models/Token.test.ts +13 -13
- package/src/models/Token.ts +64 -63
- package/src/models/UsedRegisterCode.ts +20 -21
- package/src/models/User.ts +148 -144
- package/src/models/UserPermissions.ts +25 -28
- package/src/models/Webshop.ts +53 -53
- package/src/models/WebshopDiscountCode.ts +33 -33
- package/src/models/addresses/City.ts +12 -12
- package/src/models/addresses/PostalCode.test.ts +68 -69
- package/src/models/addresses/PostalCode.ts +57 -57
- package/src/models/addresses/Province.ts +8 -8
- package/src/models/addresses/Street.ts +10 -12
- package/src/models/index.ts +54 -55
- package/src/structures/OrganizationServerMetaData.ts +36 -36
|
@@ -10,7 +10,7 @@ const uuid_1 = require("uuid");
|
|
|
10
10
|
* Keeps track of how much a member/user owes or needs to be reimbursed.
|
|
11
11
|
*/
|
|
12
12
|
class StripeAccount extends simple_database_1.Model {
|
|
13
|
-
static table =
|
|
13
|
+
static table = 'stripe_accounts';
|
|
14
14
|
id;
|
|
15
15
|
organizationId;
|
|
16
16
|
accountId;
|
|
@@ -32,51 +32,51 @@ class StripeAccount extends simple_database_1.Model {
|
|
|
32
32
|
requirements: structures_1.Requirements.create(account.requirements),
|
|
33
33
|
future_requirements: structures_1.Requirements.create(account.future_requirements),
|
|
34
34
|
settings: structures_1.StripeMetaAccountSettings.create(account.settings),
|
|
35
|
-
bank_account_last4: account.external_accounts?.data[0]?.last4 ?? this.meta.bank_account_last4 ??
|
|
36
|
-
bank_account_bank_name: account.external_accounts?.data[0]?.bank_name ?? this.meta.bank_account_bank_name ??
|
|
35
|
+
bank_account_last4: account.external_accounts?.data[0]?.last4 ?? this.meta.bank_account_last4 ?? '',
|
|
36
|
+
bank_account_bank_name: account.external_accounts?.data[0]?.bank_name ?? this.meta.bank_account_bank_name ?? '',
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
exports.StripeAccount = StripeAccount;
|
|
41
41
|
tslib_1.__decorate([
|
|
42
42
|
(0, simple_database_1.column)({
|
|
43
|
-
primary: true, type:
|
|
43
|
+
primary: true, type: 'string', beforeSave(value) {
|
|
44
44
|
return value ?? (0, uuid_1.v4)();
|
|
45
|
-
}
|
|
45
|
+
},
|
|
46
46
|
})
|
|
47
47
|
], StripeAccount.prototype, "id", void 0);
|
|
48
48
|
tslib_1.__decorate([
|
|
49
|
-
(0, simple_database_1.column)({ type:
|
|
49
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
50
50
|
], StripeAccount.prototype, "organizationId", void 0);
|
|
51
51
|
tslib_1.__decorate([
|
|
52
|
-
(0, simple_database_1.column)({ type:
|
|
52
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
53
53
|
], StripeAccount.prototype, "accountId", void 0);
|
|
54
54
|
tslib_1.__decorate([
|
|
55
|
-
(0, simple_database_1.column)({ type:
|
|
55
|
+
(0, simple_database_1.column)({ type: 'json', decoder: structures_1.StripeMetaData })
|
|
56
56
|
], StripeAccount.prototype, "meta", void 0);
|
|
57
57
|
tslib_1.__decorate([
|
|
58
|
-
(0, simple_database_1.column)({ type:
|
|
58
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
59
59
|
], StripeAccount.prototype, "status", void 0);
|
|
60
60
|
tslib_1.__decorate([
|
|
61
61
|
(0, simple_database_1.column)({
|
|
62
|
-
type:
|
|
62
|
+
type: 'datetime', beforeSave(old) {
|
|
63
63
|
if (old !== undefined) {
|
|
64
64
|
return old;
|
|
65
65
|
}
|
|
66
66
|
const date = new Date();
|
|
67
67
|
date.setMilliseconds(0);
|
|
68
68
|
return date;
|
|
69
|
-
}
|
|
69
|
+
},
|
|
70
70
|
})
|
|
71
71
|
], StripeAccount.prototype, "createdAt", void 0);
|
|
72
72
|
tslib_1.__decorate([
|
|
73
73
|
(0, simple_database_1.column)({
|
|
74
|
-
type:
|
|
74
|
+
type: 'datetime', beforeSave() {
|
|
75
75
|
const date = new Date();
|
|
76
76
|
date.setMilliseconds(0);
|
|
77
77
|
return date;
|
|
78
78
|
},
|
|
79
|
-
skipUpdate: true
|
|
79
|
+
skipUpdate: true,
|
|
80
80
|
})
|
|
81
81
|
], StripeAccount.prototype, "updatedAt", void 0);
|
|
82
82
|
//# sourceMappingURL=StripeAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripeAccount.js","sourceRoot":"","sources":["../../../src/models/StripeAccount.ts"],"names":[],"mappings":";;;;AAAA,0DAA0D;AAC1D,iEAA4D;AAC5D,sDAAsI;AACtI,+BAAoC;AAEpC;;GAEG;AACH,MAAa,aAAc,SAAQ,uBAAK;IACpC,MAAM,CAAC,KAAK,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"StripeAccount.js","sourceRoot":"","sources":["../../../src/models/StripeAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripeCheckoutSession.d.ts","sourceRoot":"","sources":["../../../src/models/StripeCheckoutSession.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"StripeCheckoutSession.d.ts","sourceRoot":"","sources":["../../../src/models/StripeCheckoutSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAG5D,qBAAa,qBAAsB,SAAQ,KAAK;IAC5C,MAAM,CAAC,KAAK,SAA8B;IAO1C,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,EAAE,MAAM,CAAC;IAGxB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAErC;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;CACnC"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
class StripeCheckoutSession extends simple_database_1.Model {
|
|
8
|
-
static table =
|
|
8
|
+
static table = 'stripe_checkout_sessions';
|
|
9
9
|
id;
|
|
10
10
|
paymentId;
|
|
11
11
|
stripeSessionId;
|
|
@@ -18,21 +18,21 @@ class StripeCheckoutSession extends simple_database_1.Model {
|
|
|
18
18
|
exports.StripeCheckoutSession = StripeCheckoutSession;
|
|
19
19
|
tslib_1.__decorate([
|
|
20
20
|
(0, simple_database_1.column)({
|
|
21
|
-
primary: true, type:
|
|
21
|
+
primary: true, type: 'string', beforeSave(value) {
|
|
22
22
|
return value ?? (0, uuid_1.v4)();
|
|
23
|
-
}
|
|
23
|
+
},
|
|
24
24
|
})
|
|
25
25
|
], StripeCheckoutSession.prototype, "id", void 0);
|
|
26
26
|
tslib_1.__decorate([
|
|
27
|
-
(0, simple_database_1.column)({ type:
|
|
27
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
28
28
|
], StripeCheckoutSession.prototype, "paymentId", void 0);
|
|
29
29
|
tslib_1.__decorate([
|
|
30
|
-
(0, simple_database_1.column)({ type:
|
|
30
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
31
31
|
], StripeCheckoutSession.prototype, "stripeSessionId", void 0);
|
|
32
32
|
tslib_1.__decorate([
|
|
33
|
-
(0, simple_database_1.column)({ type:
|
|
33
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
34
34
|
], StripeCheckoutSession.prototype, "organizationId", void 0);
|
|
35
35
|
tslib_1.__decorate([
|
|
36
|
-
(0, simple_database_1.column)({ type:
|
|
36
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
37
37
|
], StripeCheckoutSession.prototype, "accountId", void 0);
|
|
38
38
|
//# sourceMappingURL=StripeCheckoutSession.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripeCheckoutSession.js","sourceRoot":"","sources":["../../../src/models/StripeCheckoutSession.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"StripeCheckoutSession.js","sourceRoot":"","sources":["../../../src/models/StripeCheckoutSession.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,+BAAoC;AAEpC,MAAa,qBAAsB,SAAQ,uBAAK;IAC5C,MAAM,CAAC,KAAK,GAAG,0BAA0B,CAAC;IAO1C,EAAE,CAAU;IAGZ,SAAS,CAAS;IAGlB,eAAe,CAAS;IAGxB,cAAc,GAAkB,IAAI,CAAC;IAErC;;OAEG;IAEH,SAAS,GAAkB,IAAI,CAAC;;AAvBpC,sDAwBC;AAhBG;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;iDACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;8DACH;AAGxB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6DACN;AAMrC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;wDACX"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripePaymentIntent.d.ts","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"StripePaymentIntent.d.ts","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAG5D,qBAAa,mBAAoB,SAAQ,KAAK;IAC1C,MAAM,CAAC,KAAK,SAA4B;IAOxC,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,cAAc,EAAE,MAAM,CAAC;IAGvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAErC;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;CACnC"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
class StripePaymentIntent extends simple_database_1.Model {
|
|
8
|
-
static table =
|
|
8
|
+
static table = 'stripe_payment_intents';
|
|
9
9
|
id;
|
|
10
10
|
paymentId;
|
|
11
11
|
stripeIntentId;
|
|
@@ -18,21 +18,21 @@ class StripePaymentIntent extends simple_database_1.Model {
|
|
|
18
18
|
exports.StripePaymentIntent = StripePaymentIntent;
|
|
19
19
|
tslib_1.__decorate([
|
|
20
20
|
(0, simple_database_1.column)({
|
|
21
|
-
primary: true, type:
|
|
21
|
+
primary: true, type: 'string', beforeSave(value) {
|
|
22
22
|
return value ?? (0, uuid_1.v4)();
|
|
23
|
-
}
|
|
23
|
+
},
|
|
24
24
|
})
|
|
25
25
|
], StripePaymentIntent.prototype, "id", void 0);
|
|
26
26
|
tslib_1.__decorate([
|
|
27
|
-
(0, simple_database_1.column)({ type:
|
|
27
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
28
28
|
], StripePaymentIntent.prototype, "paymentId", void 0);
|
|
29
29
|
tslib_1.__decorate([
|
|
30
|
-
(0, simple_database_1.column)({ type:
|
|
30
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
31
31
|
], StripePaymentIntent.prototype, "stripeIntentId", void 0);
|
|
32
32
|
tslib_1.__decorate([
|
|
33
|
-
(0, simple_database_1.column)({ type:
|
|
33
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
34
34
|
], StripePaymentIntent.prototype, "organizationId", void 0);
|
|
35
35
|
tslib_1.__decorate([
|
|
36
|
-
(0, simple_database_1.column)({ type:
|
|
36
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
37
37
|
], StripePaymentIntent.prototype, "accountId", void 0);
|
|
38
38
|
//# sourceMappingURL=StripePaymentIntent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StripePaymentIntent.js","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"StripePaymentIntent.js","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,+BAAoC;AAEpC,MAAa,mBAAoB,SAAQ,uBAAK;IAC1C,MAAM,CAAC,KAAK,GAAG,wBAAwB,CAAC;IAOxC,EAAE,CAAU;IAGZ,SAAS,CAAS;IAGlB,cAAc,CAAS;IAGvB,cAAc,GAAkB,IAAI,CAAC;IAErC;;OAEG;IAEH,SAAS,GAAkB,IAAI,CAAC;;AAvBpC,kDAwBC;AAhBG;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;+CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2DACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DACN;AAMrC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sDACX"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ManyToOneRelation, Model } from
|
|
2
|
-
import { CartReservedSeat } from
|
|
1
|
+
import { ManyToOneRelation, Model } from '@simonbackx/simple-database';
|
|
2
|
+
import { CartReservedSeat } from '@stamhoofd/structures';
|
|
3
3
|
import { Order, Organization, Webshop } from './';
|
|
4
4
|
/**
|
|
5
5
|
* Use this method when you don't need access to the items of an order.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Ticket.d.ts","sourceRoot":"","sources":["../../../src/models/Ticket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAkBlD;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAqB;IAQjC,EAAE,EAAG,MAAM,CAAC;IAEZ;;OAEG;IAIH,MAAM,EAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"Ticket.d.ts","sourceRoot":"","sources":["../../../src/models/Ticket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAkBlD;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAqB;IAQjC,EAAE,EAAG,MAAM,CAAC;IAEZ;;OAEG;IAIH,MAAM,EAAG,MAAM,CAAC;IAGhB,cAAc,EAAE,MAAM,CAAC;IAGvB,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IAEH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IAEH,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B;;OAEG;IAEH,KAAK,SAAK;IAEV;;OAEG;IAEH,KAAK,SAAK;IAEV;;OAEG;IAEH,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAErC;;OAEG;IAEH,YAAY,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAY7C,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG9B,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC,MAAM,CAAC,OAAO,wCAA6C;IAC3D,MAAM,CAAC,KAAK,oCAAyC;IACrD,MAAM,CAAC,YAAY,kDAAuD;IAE1E,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,OAAO,GAAG;YAAE,YAAY,EAAE,YAAY,CAAA;SAAE,CAAA;KAAE;IAI3E,IAAI,SAAS,YAEZ;IAEK,UAAU;CAOnB"}
|
|
@@ -28,7 +28,7 @@ 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
|
-
static table =
|
|
31
|
+
static table = 'webshop_tickets';
|
|
32
32
|
// Columns
|
|
33
33
|
id;
|
|
34
34
|
/**
|
|
@@ -69,11 +69,11 @@ class Ticket extends simple_database_1.Model {
|
|
|
69
69
|
deletedAt = null;
|
|
70
70
|
scannedAt = null;
|
|
71
71
|
scannedBy = null;
|
|
72
|
-
static webshop = new simple_database_1.ManyToOneRelation(_1.Webshop,
|
|
73
|
-
static order = new simple_database_1.ManyToOneRelation(_1.Order,
|
|
74
|
-
static organization = new simple_database_1.ManyToOneRelation(_1.Organization,
|
|
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');
|
|
75
75
|
getUrl() {
|
|
76
|
-
return
|
|
76
|
+
return 'https://' + this.webshop.getHost() + '/ticket/' + this.secret;
|
|
77
77
|
}
|
|
78
78
|
get isDeleted() {
|
|
79
79
|
return this.deletedAt !== null;
|
|
@@ -89,69 +89,69 @@ class Ticket extends simple_database_1.Model {
|
|
|
89
89
|
exports.Ticket = Ticket;
|
|
90
90
|
tslib_1.__decorate([
|
|
91
91
|
(0, simple_database_1.column)({
|
|
92
|
-
primary: true, type:
|
|
92
|
+
primary: true, type: 'string', beforeSave(value) {
|
|
93
93
|
return value ?? (0, uuid_1.v4)();
|
|
94
|
-
}
|
|
94
|
+
},
|
|
95
95
|
})
|
|
96
96
|
], Ticket.prototype, "id", void 0);
|
|
97
97
|
tslib_1.__decorate([
|
|
98
|
-
(0, simple_database_1.column)({ type:
|
|
98
|
+
(0, simple_database_1.column)({ type: 'string', async beforeSave(value) {
|
|
99
99
|
return value ?? bs58.encode(await randomBytes(10));
|
|
100
100
|
} })
|
|
101
101
|
], Ticket.prototype, "secret", void 0);
|
|
102
102
|
tslib_1.__decorate([
|
|
103
|
-
(0, simple_database_1.column)({ foreignKey: Ticket.organization, type:
|
|
103
|
+
(0, simple_database_1.column)({ foreignKey: Ticket.organization, type: 'string' })
|
|
104
104
|
], Ticket.prototype, "organizationId", void 0);
|
|
105
105
|
tslib_1.__decorate([
|
|
106
|
-
(0, simple_database_1.column)({ foreignKey: Ticket.webshop, type:
|
|
106
|
+
(0, simple_database_1.column)({ foreignKey: Ticket.webshop, type: 'string' })
|
|
107
107
|
], Ticket.prototype, "webshopId", void 0);
|
|
108
108
|
tslib_1.__decorate([
|
|
109
|
-
(0, simple_database_1.column)({ foreignKey: Ticket.order, type:
|
|
109
|
+
(0, simple_database_1.column)({ foreignKey: Ticket.order, type: 'string' })
|
|
110
110
|
], Ticket.prototype, "orderId", void 0);
|
|
111
111
|
tslib_1.__decorate([
|
|
112
|
-
(0, simple_database_1.column)({ type:
|
|
112
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
113
113
|
], Ticket.prototype, "itemId", void 0);
|
|
114
114
|
tslib_1.__decorate([
|
|
115
|
-
(0, simple_database_1.column)({ type:
|
|
115
|
+
(0, simple_database_1.column)({ type: 'number' })
|
|
116
116
|
], Ticket.prototype, "index", void 0);
|
|
117
117
|
tslib_1.__decorate([
|
|
118
|
-
(0, simple_database_1.column)({ type:
|
|
118
|
+
(0, simple_database_1.column)({ type: 'number' })
|
|
119
119
|
], Ticket.prototype, "total", void 0);
|
|
120
120
|
tslib_1.__decorate([
|
|
121
|
-
(0, simple_database_1.column)({ type:
|
|
121
|
+
(0, simple_database_1.column)({ type: 'json', nullable: true, decoder: structures_1.CartReservedSeat })
|
|
122
122
|
], Ticket.prototype, "seat", void 0);
|
|
123
123
|
tslib_1.__decorate([
|
|
124
|
-
(0, simple_database_1.column)({ type:
|
|
124
|
+
(0, simple_database_1.column)({ type: 'json', nullable: true, decoder: structures_1.CartReservedSeat })
|
|
125
125
|
], Ticket.prototype, "originalSeat", void 0);
|
|
126
126
|
tslib_1.__decorate([
|
|
127
127
|
(0, simple_database_1.column)({
|
|
128
|
-
type:
|
|
128
|
+
type: 'datetime', beforeSave(old) {
|
|
129
129
|
if (old !== undefined) {
|
|
130
130
|
return old;
|
|
131
131
|
}
|
|
132
132
|
const date = new Date();
|
|
133
133
|
date.setMilliseconds(0);
|
|
134
134
|
return date;
|
|
135
|
-
}
|
|
135
|
+
},
|
|
136
136
|
})
|
|
137
137
|
], Ticket.prototype, "createdAt", void 0);
|
|
138
138
|
tslib_1.__decorate([
|
|
139
139
|
(0, simple_database_1.column)({
|
|
140
|
-
type:
|
|
140
|
+
type: 'datetime', beforeSave() {
|
|
141
141
|
const date = new Date();
|
|
142
142
|
date.setMilliseconds(0);
|
|
143
143
|
return date;
|
|
144
144
|
},
|
|
145
|
-
skipUpdate: true
|
|
145
|
+
skipUpdate: true,
|
|
146
146
|
})
|
|
147
147
|
], Ticket.prototype, "updatedAt", void 0);
|
|
148
148
|
tslib_1.__decorate([
|
|
149
|
-
(0, simple_database_1.column)({ type:
|
|
149
|
+
(0, simple_database_1.column)({ type: 'datetime', nullable: true })
|
|
150
150
|
], Ticket.prototype, "deletedAt", void 0);
|
|
151
151
|
tslib_1.__decorate([
|
|
152
|
-
(0, simple_database_1.column)({ type:
|
|
152
|
+
(0, simple_database_1.column)({ type: 'datetime', nullable: true })
|
|
153
153
|
], Ticket.prototype, "scannedAt", void 0);
|
|
154
154
|
tslib_1.__decorate([
|
|
155
|
-
(0, simple_database_1.column)({ type:
|
|
155
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
156
156
|
], Ticket.prototype, "scannedBy", void 0);
|
|
157
157
|
//# sourceMappingURL=Ticket.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"Ticket.js","sourceRoot":"","sources":["../../../src/models/Ticket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ManyToOneRelation, Model } from
|
|
2
|
-
import { ApiUser } from
|
|
3
|
-
import { RateLimiter } from
|
|
1
|
+
import { ManyToOneRelation, Model } from '@simonbackx/simple-database';
|
|
2
|
+
import { ApiUser } from '@stamhoofd/structures';
|
|
3
|
+
import { RateLimiter } from '../helpers/RateLimiter';
|
|
4
4
|
import { User } from './';
|
|
5
5
|
export type TokenWithUser = Token & {
|
|
6
6
|
user: User;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../../src/models/Token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAcnD,eAAO,MAAM,kBAAkB,aAuB7B,CAAC;AAEH,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IACxB,MAAM,CAAC,WAAW,SAAM;IAGxB,MAAM,EAAE,MAAM,CAAC;IAIf,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,qBAAqB,EAAE,IAAI,CAAC;IAG5B,sBAAsB,EAAE,IAAI,CAAC;IAY7B,SAAS,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../../src/models/Token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAcnD,eAAO,MAAM,kBAAkB,aAuB7B,CAAC;AAEH,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IACxB,MAAM,CAAC,WAAW,SAAM;IAGxB,MAAM,EAAE,MAAM,CAAC;IAIf,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,qBAAqB,EAAE,IAAI,CAAC;IAG5B,sBAAsB,EAAE,IAAI,CAAC;IAY7B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB,MAAM,CAAC,IAAI,kCAAuC;IAElD,oBAAoB,IAAI,OAAO;WAIlB,mBAAmB,CAAC,IAAI,EAAE,IAAI;IAmB3C;;OAEG;WACU,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;WAmCnG,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAqCxF;;;;OAIG;WACU,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IAWxF;;OAEG;WACU,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;WAoC3E,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;WAMpE,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;WAgBvE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAI7D"}
|
package/dist/src/models/Token.js
CHANGED
|
@@ -23,27 +23,27 @@ exports.apiUserRateLimiter = new RateLimiter_1.RateLimiter({
|
|
|
23
23
|
{
|
|
24
24
|
// Block heavy bursts (5req/s for 5s)
|
|
25
25
|
limit: 25,
|
|
26
|
-
duration: 5 * 1000
|
|
26
|
+
duration: 5 * 1000,
|
|
27
27
|
},
|
|
28
28
|
{
|
|
29
29
|
// max 1req/s during 150s
|
|
30
30
|
limit: 150,
|
|
31
|
-
duration: 150 * 1000
|
|
31
|
+
duration: 150 * 1000,
|
|
32
32
|
},
|
|
33
33
|
{
|
|
34
34
|
// 1000 requests per hour
|
|
35
35
|
limit: 1000,
|
|
36
|
-
duration: 60 * 1000 * 60
|
|
36
|
+
duration: 60 * 1000 * 60,
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
// 2000 requests per day
|
|
40
40
|
limit: 2000,
|
|
41
|
-
duration: 24 * 60 * 1000 * 60
|
|
42
|
-
}
|
|
43
|
-
]
|
|
41
|
+
duration: 24 * 60 * 1000 * 60,
|
|
42
|
+
},
|
|
43
|
+
],
|
|
44
44
|
});
|
|
45
45
|
class Token extends simple_database_1.Model {
|
|
46
|
-
static table =
|
|
46
|
+
static table = 'tokens';
|
|
47
47
|
static MAX_DEVICES = 15;
|
|
48
48
|
userId;
|
|
49
49
|
// Columns
|
|
@@ -53,7 +53,7 @@ class Token extends simple_database_1.Model {
|
|
|
53
53
|
refreshTokenValidUntil;
|
|
54
54
|
createdAt;
|
|
55
55
|
updatedAt;
|
|
56
|
-
static user = new simple_database_1.ManyToOneRelation(_1.User,
|
|
56
|
+
static user = new simple_database_1.ManyToOneRelation(_1.User, 'user');
|
|
57
57
|
isAccessTokenExpired() {
|
|
58
58
|
return this.accessTokenValidUntil < new Date() || this.refreshTokenValidUntil < new Date();
|
|
59
59
|
}
|
|
@@ -62,7 +62,7 @@ class Token extends simple_database_1.Model {
|
|
|
62
62
|
throw new Error('Unexpected user type');
|
|
63
63
|
}
|
|
64
64
|
const [lastToken] = await this.where({
|
|
65
|
-
userId: user.id
|
|
65
|
+
userId: user.id,
|
|
66
66
|
}, { limit: 1 });
|
|
67
67
|
return structures_1.ApiUser.create({
|
|
68
68
|
id: user.id,
|
|
@@ -77,7 +77,7 @@ class Token extends simple_database_1.Model {
|
|
|
77
77
|
* Get the token and user for a given accessToken IF it is still valid
|
|
78
78
|
*/
|
|
79
79
|
static async getByAccessToken(accessToken, ignoreExpireDate = false) {
|
|
80
|
-
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, user.* FROM ${this.table} ${Token.user.joinQuery(this.table,
|
|
80
|
+
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, user.* FROM ${this.table} ${Token.user.joinQuery(this.table, 'user')} WHERE ${this.primary.name} = ? LIMIT 1 `, [accessToken]);
|
|
81
81
|
if (rows.length == 0) {
|
|
82
82
|
return undefined;
|
|
83
83
|
}
|
|
@@ -90,16 +90,16 @@ class Token extends simple_database_1.Model {
|
|
|
90
90
|
// Also if the refresh token is invalid, the access token will always be invalid
|
|
91
91
|
return undefined;
|
|
92
92
|
}
|
|
93
|
-
const user = _1.User.fromRow(rows[0][
|
|
93
|
+
const user = _1.User.fromRow(rows[0]['user']) || null;
|
|
94
94
|
if (!user) {
|
|
95
|
-
console.warn(
|
|
95
|
+
console.warn('Selected a token without a user!');
|
|
96
96
|
return undefined;
|
|
97
97
|
}
|
|
98
98
|
return token.setRelation(Token.user, user);
|
|
99
99
|
}
|
|
100
100
|
// Methods
|
|
101
101
|
static async getByRefreshToken(refreshToken) {
|
|
102
|
-
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, ${_1.User.getDefaultSelect(
|
|
102
|
+
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, ${_1.User.getDefaultSelect('user')} FROM ${this.table} ${Token.user.joinQuery(this.table, 'user')} WHERE \`refreshToken\` = ? LIMIT 1 `, [refreshToken]);
|
|
103
103
|
if (rows.length == 0) {
|
|
104
104
|
return undefined;
|
|
105
105
|
}
|
|
@@ -110,14 +110,14 @@ class Token extends simple_database_1.Model {
|
|
|
110
110
|
}
|
|
111
111
|
if (token.refreshTokenValidUntil < new Date()) {
|
|
112
112
|
// Refreh token invalid = can throw it away
|
|
113
|
-
token.delete().catch(e => {
|
|
113
|
+
token.delete().catch((e) => {
|
|
114
114
|
console.error(e);
|
|
115
115
|
});
|
|
116
116
|
return undefined;
|
|
117
117
|
}
|
|
118
|
-
const user = _1.User.fromRow(rows[0][
|
|
118
|
+
const user = _1.User.fromRow(rows[0]['user']) || null;
|
|
119
119
|
if (!user || user.isApiUser) {
|
|
120
|
-
console.warn(
|
|
120
|
+
console.warn('Selected a token without a user!');
|
|
121
121
|
return undefined;
|
|
122
122
|
}
|
|
123
123
|
return token.setRelation(Token.user, user);
|
|
@@ -159,8 +159,8 @@ class Token extends simple_database_1.Model {
|
|
|
159
159
|
token.refreshTokenValidUntil = new Date();
|
|
160
160
|
token.refreshTokenValidUntil.setTime(token.refreshTokenValidUntil.getTime() + 3600 * 1000 * 24 * 365);
|
|
161
161
|
token.refreshTokenValidUntil.setMilliseconds(0);
|
|
162
|
-
token.accessToken = (await randomBytes(192)).toString(
|
|
163
|
-
token.refreshToken = (await randomBytes(192)).toString(
|
|
162
|
+
token.accessToken = (await randomBytes(192)).toString('base64').toUpperCase();
|
|
163
|
+
token.refreshToken = (await randomBytes(192)).toString('base64').toUpperCase();
|
|
164
164
|
return token;
|
|
165
165
|
}
|
|
166
166
|
static async createToken(user) {
|
|
@@ -187,40 +187,40 @@ class Token extends simple_database_1.Model {
|
|
|
187
187
|
}
|
|
188
188
|
exports.Token = Token;
|
|
189
189
|
tslib_1.__decorate([
|
|
190
|
-
(0, simple_database_1.column)({ type:
|
|
190
|
+
(0, simple_database_1.column)({ type: 'string', foreignKey: Token.user })
|
|
191
191
|
], Token.prototype, "userId", void 0);
|
|
192
192
|
tslib_1.__decorate([
|
|
193
|
-
(0, simple_database_1.column)({ primary: true, type:
|
|
193
|
+
(0, simple_database_1.column)({ primary: true, type: 'string' })
|
|
194
194
|
], Token.prototype, "accessToken", void 0);
|
|
195
195
|
tslib_1.__decorate([
|
|
196
|
-
(0, simple_database_1.column)({ type:
|
|
196
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
197
197
|
], Token.prototype, "refreshToken", void 0);
|
|
198
198
|
tslib_1.__decorate([
|
|
199
|
-
(0, simple_database_1.column)({ type:
|
|
199
|
+
(0, simple_database_1.column)({ type: 'datetime' })
|
|
200
200
|
], Token.prototype, "accessTokenValidUntil", void 0);
|
|
201
201
|
tslib_1.__decorate([
|
|
202
|
-
(0, simple_database_1.column)({ type:
|
|
202
|
+
(0, simple_database_1.column)({ type: 'datetime' })
|
|
203
203
|
], Token.prototype, "refreshTokenValidUntil", void 0);
|
|
204
204
|
tslib_1.__decorate([
|
|
205
205
|
(0, simple_database_1.column)({
|
|
206
|
-
type:
|
|
206
|
+
type: 'datetime', beforeSave(old) {
|
|
207
207
|
if (old !== undefined) {
|
|
208
208
|
return old;
|
|
209
209
|
}
|
|
210
210
|
const date = new Date();
|
|
211
211
|
date.setMilliseconds(0);
|
|
212
212
|
return date;
|
|
213
|
-
}
|
|
213
|
+
},
|
|
214
214
|
})
|
|
215
215
|
], Token.prototype, "createdAt", void 0);
|
|
216
216
|
tslib_1.__decorate([
|
|
217
217
|
(0, simple_database_1.column)({
|
|
218
|
-
type:
|
|
218
|
+
type: 'datetime', beforeSave() {
|
|
219
219
|
const date = new Date();
|
|
220
220
|
date.setMilliseconds(0);
|
|
221
221
|
return date;
|
|
222
222
|
},
|
|
223
|
-
skipUpdate: true
|
|
223
|
+
skipUpdate: true,
|
|
224
224
|
})
|
|
225
225
|
], Token.prototype, "updatedAt", void 0);
|
|
226
226
|
//# sourceMappingURL=Token.js.map
|
|
@@ -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;IAC5B,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IACxB,MAAM,CAAC,WAAW,GAAG,EAAE,CAAC;IAGxB,MAAM,CAAS;IAEf,UAAU;IAEV,WAAW,CAAS;IAGpB,YAAY,CAAS;IAGrB,qBAAqB,CAAO;IAG5B,sBAAsB,CAAO;IAY7B,SAAS,
|
|
1
|
+
{"version":3,"file":"Token.js","sourceRoot":"","sources":["../../../src/models/Token.ts"],"names":[],"mappings":"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"}
|