@antelopejs/dms-saas 0.1.8 → 0.2.1
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/README.md +262 -13
- package/dist/auth/subscription-access-gate.d.ts +1 -1
- package/dist/billing-state/index.d.ts +1 -0
- package/dist/billing-state/index.js +1 -0
- package/dist/billing-state/index.js.map +1 -1
- package/dist/billing-state/past-due-banner.d.ts +4 -0
- package/dist/billing-state/past-due-banner.js +25 -0
- package/dist/billing-state/past-due-banner.js.map +1 -0
- package/dist/config/runtime.d.ts +6 -1
- package/dist/config/runtime.js +50 -1
- package/dist/config/runtime.js.map +1 -1
- package/dist/crons/recompute-billing-state.js +4 -1
- package/dist/crons/recompute-billing-state.js.map +1 -1
- package/dist/data-api/platformOwner/index.d.ts +1 -0
- package/dist/data-api/platformOwner/index.js +1 -0
- package/dist/data-api/platformOwner/index.js.map +1 -1
- package/dist/data-api/platformOwner/invitations.d.ts +22 -0
- package/dist/data-api/platformOwner/invitations.js +121 -0
- package/dist/data-api/platformOwner/invitations.js.map +1 -0
- package/dist/data-api/platformOwner/workspaces.d.ts +3 -0
- package/dist/data-api/platformOwner/workspaces.js +64 -12
- package/dist/data-api/platformOwner/workspaces.js.map +1 -1
- package/dist/data-api/tenant/tenant-invoices.js +2 -10
- package/dist/data-api/tenant/tenant-invoices.js.map +1 -1
- package/dist/hooks/register.js +2 -1
- package/dist/hooks/register.js.map +1 -1
- package/dist/implementations/dms-saas/billing.d.ts +2 -1
- package/dist/implementations/dms-saas/billing.js +6 -0
- package/dist/implementations/dms-saas/billing.js.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/invoice-line-items/injection.d.ts +10 -0
- package/dist/invoice-line-items/injection.js +7 -3
- package/dist/invoice-line-items/injection.js.map +1 -1
- package/dist/notifications/subjects.d.ts +19 -19
- package/dist/operator-actions/index.d.ts +1 -0
- package/dist/operator-actions/index.js +1 -0
- package/dist/operator-actions/index.js.map +1 -1
- package/dist/operator-actions/invitation-commands.d.ts +12 -0
- package/dist/operator-actions/invitation-commands.js +46 -0
- package/dist/operator-actions/invitation-commands.js.map +1 -0
- package/dist/operator-actions/types.d.ts +1 -1
- package/dist/pages/platform/categories.d.ts +6 -6
- package/dist/pages/platform/credit-notes.d.ts +1 -1
- package/dist/pages/platform/dashboard.d.ts +2 -2
- package/dist/pages/platform/dashboard.js +2 -4
- package/dist/pages/platform/dashboard.js.map +1 -1
- package/dist/pages/platform/features.d.ts +1 -1
- package/dist/pages/platform/invoices.d.ts +1 -1
- package/dist/pages/platform/plans/edit.d.ts +2 -2
- package/dist/pages/platform/plans/index.d.ts +1 -1
- package/dist/pages/platform/plans/migrations.d.ts +1 -1
- package/dist/pages/platform/segments/index.d.ts +1 -1
- package/dist/pages/platform/settings.d.ts +1 -1
- package/dist/pages/platform/users/detail.d.ts +1 -1
- package/dist/pages/platform/users/index.d.ts +1 -1
- package/dist/pages/platform/workspaces/detail.d.ts +1 -1
- package/dist/pages/platform/workspaces/detail.js +40 -1
- package/dist/pages/platform/workspaces/detail.js.map +1 -1
- package/dist/pages/platform/workspaces/index.d.ts +4 -10
- package/dist/pages/platform/workspaces/index.js +27 -111
- package/dist/pages/platform/workspaces/index.js.map +1 -1
- package/dist/pages/public/legal/privacy-policy.js +2 -1
- package/dist/pages/public/legal/privacy-policy.js.map +1 -1
- package/dist/pages/public/legal/terms-and-conditions.js +2 -1
- package/dist/pages/public/legal/terms-and-conditions.js.map +1 -1
- package/dist/pages/public/legal/terms-of-use.js +2 -1
- package/dist/pages/public/legal/terms-of-use.js.map +1 -1
- package/dist/pages/tenant/billing.d.ts +1 -1
- package/dist/plans/index.d.ts +1 -0
- package/dist/plans/index.js +1 -0
- package/dist/plans/index.js.map +1 -1
- package/dist/plans/platform-support.d.ts +2 -0
- package/dist/plans/platform-support.js +19 -0
- package/dist/plans/platform-support.js.map +1 -0
- package/dist/plans/seat-capacity.d.ts +9 -2
- package/dist/plans/seat-capacity.js +59 -12
- package/dist/plans/seat-capacity.js.map +1 -1
- package/dist/plans/seat-hooks.js +34 -13
- package/dist/plans/seat-hooks.js.map +1 -1
- package/dist/routes/platformOwner/billing-settings.d.ts +2 -2
- package/dist/routes/platformOwner/dashboard.d.ts +8 -6
- package/dist/routes/platformOwner/dashboard.js +31 -17
- package/dist/routes/platformOwner/dashboard.js.map +1 -1
- package/dist/routes/platformOwner/index.d.ts +1 -0
- package/dist/routes/platformOwner/index.js +1 -0
- package/dist/routes/platformOwner/index.js.map +1 -1
- package/dist/routes/platformOwner/plan-deletion.d.ts +1 -1
- package/dist/routes/platformOwner/plans.d.ts +5 -5
- package/dist/routes/platformOwner/segments.d.ts +1 -1
- package/dist/routes/platformOwner/workspace-invitations.d.ts +13 -0
- package/dist/routes/platformOwner/workspace-invitations.js +73 -0
- package/dist/routes/platformOwner/workspace-invitations.js.map +1 -0
- package/dist/routes/public/legal-documents.d.ts +2 -2
- package/dist/routes/public/register.d.ts +7 -3
- package/dist/routes/public/register.js +42 -27
- package/dist/routes/public/register.js.map +1 -1
- package/dist/routes/tenant/tenant-billing.d.ts +7 -11
- package/dist/routes/tenant/tenant-billing.js +34 -26
- package/dist/routes/tenant/tenant-billing.js.map +1 -1
- package/dist/routes/tenant/tenant-plan.d.ts +1 -0
- package/dist/routes/tenant/tenant-plan.js +27 -2
- package/dist/routes/tenant/tenant-plan.js.map +1 -1
- package/dist/routes/tenant/tenant-seats.d.ts +2 -4
- package/dist/routes/tenant/tenant-seats.js.map +1 -1
- package/dist/routes/tenant/workspaces.d.ts +3 -1
- package/dist/routes/tenant/workspaces.js +10 -4
- package/dist/routes/tenant/workspaces.js.map +1 -1
- package/dist/stripe/upcoming-invoice.d.ts +21 -0
- package/dist/stripe/upcoming-invoice.js +42 -0
- package/dist/stripe/upcoming-invoice.js.map +1 -0
- package/dist/stripe/webhook-dispatch.js +2 -0
- package/dist/stripe/webhook-dispatch.js.map +1 -1
- package/dist/types/config.d.ts +9 -0
- package/dist/types/config.js +7 -0
- package/dist/types/config.js.map +1 -1
- package/dist/upcoming-invoice/db/preview-cache.model.d.ts +38 -0
- package/dist/upcoming-invoice/db/preview-cache.model.js +57 -0
- package/dist/upcoming-invoice/db/preview-cache.model.js.map +1 -0
- package/dist/upcoming-invoice/db/preview-cache.table.d.ts +10 -0
- package/dist/upcoming-invoice/db/preview-cache.table.js +42 -0
- package/dist/upcoming-invoice/db/preview-cache.table.js.map +1 -0
- package/dist/upcoming-invoice/eligibility.d.ts +17 -0
- package/dist/upcoming-invoice/eligibility.js +52 -0
- package/dist/upcoming-invoice/eligibility.js.map +1 -0
- package/dist/upcoming-invoice/invalidation.d.ts +2 -0
- package/dist/upcoming-invoice/invalidation.js +39 -0
- package/dist/upcoming-invoice/invalidation.js.map +1 -0
- package/dist/upcoming-invoice/mapping.d.ts +8 -0
- package/dist/upcoming-invoice/mapping.js +82 -0
- package/dist/upcoming-invoice/mapping.js.map +1 -0
- package/dist/upcoming-invoice/outcomes.d.ts +13 -0
- package/dist/upcoming-invoice/outcomes.js +15 -0
- package/dist/upcoming-invoice/outcomes.js.map +1 -0
- package/dist/upcoming-invoice/preview.d.ts +3 -0
- package/dist/upcoming-invoice/preview.js +80 -0
- package/dist/upcoming-invoice/preview.js.map +1 -0
- package/dist/upcoming-invoice/pricing.d.ts +3 -0
- package/dist/upcoming-invoice/pricing.js +84 -0
- package/dist/upcoming-invoice/pricing.js.map +1 -0
- package/dist/upcoming-invoice/usage.d.ts +14 -0
- package/dist/upcoming-invoice/usage.js +53 -0
- package/dist/upcoming-invoice/usage.js.map +1 -0
- package/dist/utils/invoice-lines-type.d.ts +1 -1
- package/dist/workspaces/billing-identity.d.ts +19 -0
- package/dist/workspaces/billing-identity.js +51 -0
- package/dist/workspaces/billing-identity.js.map +1 -0
- package/dist/workspaces/default-plan.d.ts +5 -0
- package/dist/workspaces/default-plan.js +109 -0
- package/dist/workspaces/default-plan.js.map +1 -0
- package/dist/workspaces/index.d.ts +2 -0
- package/dist/workspaces/index.js +2 -0
- package/dist/workspaces/index.js.map +1 -1
- package/dist/workspaces/invitations.d.ts +26 -0
- package/dist/workspaces/invitations.js +112 -0
- package/dist/workspaces/invitations.js.map +1 -0
- package/dist/workspaces/provisioning.d.ts +3 -3
- package/dist/workspaces/provisioning.js +39 -11
- package/dist/workspaces/provisioning.js.map +1 -1
- package/frontend-vue/app/components/BillingIdentityFields.vue +179 -0
- package/frontend-vue/app/components/PastDueBanner.vue +81 -0
- package/frontend-vue/app/components/PaymentMethodCard.vue +94 -38
- package/frontend-vue/app/components/PlanComparisonModal.vue +62 -26
- package/frontend-vue/app/components/PlanUpgradeModal.vue +181 -0
- package/frontend-vue/app/components/PlatformNotes.vue +4 -0
- package/frontend-vue/app/components/RefundButton.vue +10 -1
- package/frontend-vue/app/components/Register.vue +49 -92
- package/frontend-vue/app/components/SeatQuotaBanner.vue +28 -0
- package/frontend-vue/app/components/TenantBillingForm.vue +52 -128
- package/frontend-vue/app/components/TenantPlanCard.vue +68 -10
- package/frontend-vue/app/components/UserSummaryCard.vue +12 -10
- package/frontend-vue/app/components/WorkspaceAdminCreateModal.vue +202 -0
- package/frontend-vue/app/components/WorkspaceCreateModal.vue +46 -9
- package/frontend-vue/app/components/WorkspaceInvitationLink.vue +106 -0
- package/frontend-vue/app/components/WorkspaceSummaryCard.vue +39 -15
- package/frontend-vue/app/components/WorkspaceSuspended.vue +3 -5
- package/frontend-vue/app/components/WorkspaceSwitcherWidget.vue +8 -5
- package/frontend-vue/app/composables/useBillingCountries.ts +25 -5
- package/frontend-vue/app/composables/useBillingIdentity.ts +141 -0
- package/frontend-vue/app/composables/useInvitationLink.ts +69 -0
- package/frontend-vue/app/composables/usePastDueBannerAction.ts +20 -0
- package/frontend-vue/app/composables/usePlanComparison.ts +15 -0
- package/frontend-vue/app/composables/usePlanFeatureFormat.ts +312 -20
- package/frontend-vue/app/composables/usePlanFeatureLabel.ts +24 -0
- package/frontend-vue/app/composables/useSaasRegistration.ts +110 -223
- package/frontend-vue/app/composables/useSeatQuota.ts +8 -0
- package/frontend-vue/app/composables/useStripePaymentElement.ts +3 -3
- package/frontend-vue/app/composables/useWorkspaceAccessCache.ts +29 -2
- package/frontend-vue/app/composables/useWorkspaceFinalization.ts +7 -32
- package/frontend-vue/app/custom-pages/auth/no-workspace.vue +49 -194
- package/frontend-vue/app/plugins/auth-links.ts +0 -4
- package/frontend-vue/app/types/runtime-config.ts +13 -0
- package/frontend-vue/dms.frontend.ts +10 -4
- package/frontend-vue/i18n/locales/saas-en-GB.json +161 -36
- package/frontend-vue/i18n/locales/saas-fr-FR.json +162 -37
- package/frontend-vue/package.json +0 -1
- package/frontend-vue/pnpm-lock.yaml +1 -125
- package/package.json +15 -15
- package/frontend-vue/app/middleware/workspace-suspended.global.ts +0 -59
|
@@ -14,13 +14,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.SaasTenantBillingController = void 0;
|
|
16
16
|
const interface_api_1 = require("@antelopejs/interface-api");
|
|
17
|
+
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
18
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
17
19
|
const guards_1 = require("@antelopejs/interface-dms/guards");
|
|
18
20
|
const tenant_scoped_model_1 = require("@antelopejs/interface-dms/tenant-scoped-model");
|
|
19
21
|
const db_1 = require("../../db");
|
|
22
|
+
const billing_identity_1 = require("../../workspaces/billing-identity");
|
|
20
23
|
const complimentary_1 = require("../../workspaces/complimentary");
|
|
21
24
|
const stripe_1 = require("../../stripe");
|
|
22
|
-
const
|
|
23
|
-
const
|
|
25
|
+
const HTTP_BAD_REQUEST = 400;
|
|
26
|
+
const ANY_AUDIENCE = "any";
|
|
24
27
|
const SETTLED_VAT_STATUSES = new Set([
|
|
25
28
|
"verified",
|
|
26
29
|
"unverified",
|
|
@@ -41,25 +44,29 @@ function toResponse(info) {
|
|
|
41
44
|
vatVerificationStatus: info.vatVerificationStatus ?? null,
|
|
42
45
|
billingEmail: info.billingEmail,
|
|
43
46
|
address: info.address,
|
|
47
|
+
missingFields: (0, billing_identity_1.findMissingBillingIdentityFields)({
|
|
48
|
+
...info,
|
|
49
|
+
address: info.address ?? undefined,
|
|
50
|
+
}),
|
|
44
51
|
};
|
|
45
52
|
}
|
|
46
|
-
function
|
|
47
|
-
const trimmed = value?.trim();
|
|
48
|
-
return trimmed ? trimmed : null;
|
|
49
|
-
}
|
|
50
|
-
function buildBillingInfoValues(current, body, vatVerificationStatus) {
|
|
51
|
-
const customerType = current?.customerType ?? DEFAULT_CUSTOMER_TYPE;
|
|
52
|
-
const isBusiness = customerType === BUSINESS_CUSTOMER_TYPE;
|
|
53
|
+
function buildBillingInfoValues(identity, vatVerificationStatus) {
|
|
53
54
|
return {
|
|
54
|
-
customerType,
|
|
55
|
-
companyName:
|
|
56
|
-
vatNumber:
|
|
55
|
+
customerType: identity.customerType,
|
|
56
|
+
companyName: identity.companyName,
|
|
57
|
+
vatNumber: identity.vatNumber,
|
|
57
58
|
vatVerificationStatus,
|
|
58
|
-
billingEmail:
|
|
59
|
-
address: (0, stripe_1.toTenantBillingAddress)(
|
|
59
|
+
billingEmail: identity.billingEmail,
|
|
60
|
+
address: (0, stripe_1.toTenantBillingAddress)(identity.address),
|
|
60
61
|
updatedAt: new Date(),
|
|
61
62
|
};
|
|
62
63
|
}
|
|
64
|
+
async function assertCustomerTypeFitsPlan(customerType, subscription) {
|
|
65
|
+
if (!subscription?.planId)
|
|
66
|
+
return;
|
|
67
|
+
const plan = await (0, interface_database_decorators_1.GetModel)(db_1.PlanModel).get(subscription.planId);
|
|
68
|
+
(0, interface_api_util_1.assert)(!plan || plan.audience === ANY_AUDIENCE || plan.audience === customerType, HTTP_BAD_REQUEST, "saas.errors.plan.not_available_for_customer_type");
|
|
69
|
+
}
|
|
63
70
|
async function persistBillingInfo(model, current, values) {
|
|
64
71
|
if (!current) {
|
|
65
72
|
await model.insert([values]);
|
|
@@ -88,36 +95,37 @@ class SaasTenantBillingController extends (0, interface_api_1.Controller)("/api/
|
|
|
88
95
|
async getBillingInfo(_user, billingModel, subscriptionModel) {
|
|
89
96
|
const info = await billingModel.findOne();
|
|
90
97
|
if (!info)
|
|
91
|
-
return EMPTY_BILLING_INFO;
|
|
98
|
+
return toResponse(EMPTY_BILLING_INFO);
|
|
92
99
|
const subscription = await subscriptionModel.findOne();
|
|
93
100
|
const refreshed = await this.refreshVatVerification(info, (0, complimentary_1.isComplimentarySubscription)(subscription)
|
|
94
101
|
? null
|
|
95
102
|
: subscription?.stripeCustomerId, billingModel);
|
|
96
103
|
return toResponse(refreshed);
|
|
97
104
|
}
|
|
98
|
-
async syncStripe(customerId,
|
|
105
|
+
async syncStripe(customerId, fallbackName, identity) {
|
|
99
106
|
await (0, stripe_1.syncStripeCustomerBilling)(customerId, {
|
|
100
|
-
customerType,
|
|
101
|
-
companyName:
|
|
107
|
+
customerType: identity.customerType,
|
|
108
|
+
companyName: identity.companyName,
|
|
102
109
|
fallbackName,
|
|
103
|
-
billingEmail:
|
|
104
|
-
address:
|
|
110
|
+
billingEmail: identity.billingEmail,
|
|
111
|
+
address: identity.address,
|
|
105
112
|
});
|
|
106
113
|
return (0, stripe_1.reconcileStripeTaxId)(customerId, {
|
|
107
|
-
customerType,
|
|
108
|
-
vatNumber:
|
|
109
|
-
address:
|
|
114
|
+
customerType: identity.customerType,
|
|
115
|
+
vatNumber: identity.vatNumber,
|
|
116
|
+
address: identity.address,
|
|
110
117
|
});
|
|
111
118
|
}
|
|
112
119
|
async updateBillingInfo(user, body, billingModel, subscriptionModel) {
|
|
120
|
+
const identity = (0, billing_identity_1.parseBillingIdentity)(body);
|
|
113
121
|
const info = await billingModel.findOne();
|
|
114
|
-
const customerType = info?.customerType ?? DEFAULT_CUSTOMER_TYPE;
|
|
115
122
|
const subscription = await subscriptionModel.findOne();
|
|
123
|
+
await assertCustomerTypeFitsPlan(identity.customerType, subscription);
|
|
116
124
|
const vatVerificationStatus = subscription?.stripeCustomerId &&
|
|
117
125
|
!(0, complimentary_1.isComplimentarySubscription)(subscription)
|
|
118
|
-
? await this.syncStripe(subscription.stripeCustomerId,
|
|
126
|
+
? await this.syncStripe(subscription.stripeCustomerId, user.name, identity)
|
|
119
127
|
: null;
|
|
120
|
-
const values = buildBillingInfoValues(
|
|
128
|
+
const values = buildBillingInfoValues(identity, vatVerificationStatus);
|
|
121
129
|
await persistBillingInfo(billingModel, info, values);
|
|
122
130
|
const updated = await billingModel.findOne();
|
|
123
131
|
return toResponse(updated ?? values);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-billing.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-billing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAA2E;AAC3E,6DAG0C;AAC1C,uFAAkF;
|
|
1
|
+
{"version":3,"file":"tenant-billing.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-billing.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare class SaasTenantPlanController extends SaasTenantPlanController_b
|
|
|
8
8
|
planModel: PlanModel;
|
|
9
9
|
featureModel: FeatureModel;
|
|
10
10
|
private buildCatalog;
|
|
11
|
+
private loadSubscription;
|
|
11
12
|
getCurrentPlan(_user: User, ctx: any, tenantSubscriptionModel: TenantSubscriptionModel): Promise<CurrentPlanResult>;
|
|
12
13
|
cancelPendingChange(user: User, ctx: any, tenantSubscriptionModel: TenantSubscriptionModel): Promise<ChangePlanResult>;
|
|
13
14
|
changePlan(user: User, body: ChangePlanBody, ctx: any, tenantSubscriptionModel: TenantSubscriptionModel, tenantBillingInfoModel: TenantBillingInfoModel): Promise<ChangePlanResult>;
|
|
@@ -24,8 +24,23 @@ const tenant_access_1 = require("@antelopejs/interface-dms/tenant-access");
|
|
|
24
24
|
const db_2 = require("../../db");
|
|
25
25
|
const plan_changes_1 = require("../../plan-changes");
|
|
26
26
|
const plans_1 = require("../../plans");
|
|
27
|
+
const billing_identity_1 = require("../../workspaces/billing-identity");
|
|
27
28
|
const complimentary_1 = require("../../workspaces/complimentary");
|
|
29
|
+
const default_plan_1 = require("../../workspaces/default-plan");
|
|
28
30
|
const tenant_plan_ops_1 = require("./tenant-plan-ops");
|
|
31
|
+
function startsPaidCheckout(newPlan, subscription) {
|
|
32
|
+
return (0, tenant_plan_ops_1.isPaidPlan)(newPlan) && !subscription?.stripeSubscriptionId;
|
|
33
|
+
}
|
|
34
|
+
function assertBillingIdentityComplete(billingInfo) {
|
|
35
|
+
const missing = (0, billing_identity_1.findMissingBillingIdentityFields)({
|
|
36
|
+
customerType: billingInfo?.customerType,
|
|
37
|
+
companyName: billingInfo?.companyName,
|
|
38
|
+
vatNumber: billingInfo?.vatNumber,
|
|
39
|
+
billingEmail: billingInfo?.billingEmail,
|
|
40
|
+
address: billingInfo?.address ?? undefined,
|
|
41
|
+
});
|
|
42
|
+
(0, interface_api_util_1.assert)(missing.length === 0, tenant_plan_ops_1.HTTP_BAD_REQUEST, "saas.errors.billing.identity_incomplete");
|
|
43
|
+
}
|
|
29
44
|
class SaasTenantPlanController extends (0, interface_api_1.Controller)("/api/saas/tenant/plan") {
|
|
30
45
|
async buildCatalog(current) {
|
|
31
46
|
const publicPlans = await this.planModel.findPubliclyVisible();
|
|
@@ -34,11 +49,18 @@ class SaasTenantPlanController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
34
49
|
: publicPlans;
|
|
35
50
|
return (0, plans_1.buildTenantPlanCatalog)(this.planModel, this.featureModel, withCurrent);
|
|
36
51
|
}
|
|
52
|
+
async loadSubscription(tenantId, tenantSubscriptionModel) {
|
|
53
|
+
const subscription = await tenantSubscriptionModel.findOne();
|
|
54
|
+
if (subscription || !(await (0, default_plan_1.ensureDefaultSubscription)(tenantId))) {
|
|
55
|
+
return subscription;
|
|
56
|
+
}
|
|
57
|
+
return tenantSubscriptionModel.findOne();
|
|
58
|
+
}
|
|
37
59
|
async getCurrentPlan(_user, ctx, tenantSubscriptionModel) {
|
|
38
60
|
const tenantId = (0, request_tenant_1.getRequestTenantId)(ctx);
|
|
39
61
|
const tenant = await this.tenantModel.get(tenantId);
|
|
40
62
|
(0, interface_api_util_1.assert)(tenant, tenant_plan_ops_1.HTTP_NOT_FOUND, "saas.errors.workspace.not_found");
|
|
41
|
-
const subscription = await
|
|
63
|
+
const subscription = await this.loadSubscription(tenantId, tenantSubscriptionModel);
|
|
42
64
|
const current = subscription?.planId
|
|
43
65
|
? ((await this.planModel.get(subscription.planId)) ?? null)
|
|
44
66
|
: null;
|
|
@@ -84,6 +106,9 @@ class SaasTenantPlanController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
84
106
|
if (subscription?.planId === body.planId && !isRecovery) {
|
|
85
107
|
return this.resolveSamePlanRequest(tenantId, subscription);
|
|
86
108
|
}
|
|
109
|
+
if (!isRecovery && startsPaidCheckout(newPlan, subscription)) {
|
|
110
|
+
assertBillingIdentityComplete(billingInfo);
|
|
111
|
+
}
|
|
87
112
|
return this.routePlanChange({
|
|
88
113
|
tenantId,
|
|
89
114
|
user,
|
|
@@ -104,7 +129,7 @@ class SaasTenantPlanController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
104
129
|
}
|
|
105
130
|
async routePlanChange(request) {
|
|
106
131
|
const { tenantId, user, newPlan, subscription, tenantSubscriptionModel } = request;
|
|
107
|
-
if ((
|
|
132
|
+
if (startsPaidCheckout(newPlan, subscription)) {
|
|
108
133
|
return (0, tenant_plan_ops_1.startPaidCheckout)(request);
|
|
109
134
|
}
|
|
110
135
|
if (!subscription) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-plan.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-plan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAOmC;AACnC,uEAAwD;AACxD,6FAAkE;AAClE,qDAA2D;AAC3D,6DAG0C;AAC1C,6EAA8E;AAC9E,uFAAkF;AAClF,2EAA6E;AAE7E,
|
|
1
|
+
{"version":3,"file":"tenant-plan.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,8 @@ import { type RequestContext } from "@antelopejs/interface-api";
|
|
|
2
2
|
import { TenantMemberModel } from "@antelopejs/interface-dms/db";
|
|
3
3
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
4
4
|
import { PlanModel, TenantSubscriptionModel } from "../../db";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
pendingInvites: number;
|
|
8
|
-
occupied: number;
|
|
5
|
+
import { type SeatUsage } from "../../plans";
|
|
6
|
+
interface SeatQuotaResult extends SeatUsage {
|
|
9
7
|
maxMembers: number | null;
|
|
10
8
|
isTenantOwner: boolean;
|
|
11
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-seats.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-seats.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAKmC;AACnC,6FAAkE;AAClE,qDAAiE;AACjE,6DAAoE;AACpE,6EAA8E;AAC9E,uFAAkF;AAElF,iCAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"tenant-seats.js","sourceRoot":"","sources":["../../../src/routes/tenant/tenant-seats.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAKmC;AACnC,6FAAkE;AAClE,qDAAiE;AACjE,6DAAoE;AACpE,6EAA8E;AAC9E,uFAAkF;AAElF,iCAA8D;AAC9D,uCAA2D;AAa3D,MAAa,yBAA0B,SAAQ,IAAA,0BAAU,EACvD,wBAAwB,CACzB;IAKO,AAAN,KAAK,CAAC,YAAY,CACL,GAAmB,EACV,IAAU,EAE9B,uBAAgD,EAEhD,iBAAoC;QAEpC,MAAM,QAAQ,GAAG,IAAA,mCAAkB,EAAC,GAAG,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1D,IAAA,oBAAY,EAAC,QAAQ,CAAC;YACtB,uBAAuB,CAAC,OAAO,EAAE;YACjC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;SACtC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,EAAE,MAAM;YAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC;QACT,OAAO;YACL,GAAG,KAAK;YACR,UAAU,EAAE,IAAI,EAAE,UAAU,IAAI,IAAI;YACpC,aAAa,EAAE,CAAC,CAAC,UAAU,EAAE,aAAa;SAC3C,CAAC;IACJ,CAAC;CACF;AA9BD,8DA8BC;AA1BS;IADP,IAAA,qCAAK,EAAC,cAAS,CAAC;8BACE,cAAS;4DAAC;AAGvB;IADL,IAAA,mBAAG,EAAC,GAAG,CAAC;IAEN,WAAA,IAAA,uBAAO,GAAE,CAAA;IACT,WAAA,IAAA,yBAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,uCAAiB,EAAC,4BAAuB,CAAC,CAAA;IAE1C,WAAA,IAAA,uCAAiB,EAAC,sBAAiB,CAAC,CAAA;;uDADZ,4BAAuB;QAE7B,sBAAiB;;6DAgBrC"}
|
|
@@ -59,12 +59,14 @@ export declare class SaasWorkspacesController extends SaasWorkspacesController_b
|
|
|
59
59
|
_id: string;
|
|
60
60
|
name: string;
|
|
61
61
|
createdAt: Date;
|
|
62
|
-
status: "active" | "
|
|
62
|
+
status: "active" | "cancelled" | "suspended" | "trialing" | "past_due" | "pending_payment" | null;
|
|
63
63
|
planId: string | null;
|
|
64
64
|
planName: string | null;
|
|
65
65
|
currency: string;
|
|
66
66
|
mrr: number;
|
|
67
67
|
membersCount: number;
|
|
68
|
+
platformSupportCount: number;
|
|
69
|
+
pendingInvitationsCount: number;
|
|
68
70
|
subscription: TenantSubscription | null;
|
|
69
71
|
billingInfo: TenantBillingInfo | null;
|
|
70
72
|
members: WorkspaceMemberRow[];
|
|
@@ -26,6 +26,7 @@ const db_2 = require("@antelopejs/interface-dms/auth/db");
|
|
|
26
26
|
const db_3 = require("../../db");
|
|
27
27
|
const stripe_1 = require("../../stripe");
|
|
28
28
|
const config_1 = require("../../config");
|
|
29
|
+
const plans_1 = require("../../plans");
|
|
29
30
|
const utils_1 = require("../../utils");
|
|
30
31
|
const workspaces_1 = require("../../workspaces");
|
|
31
32
|
const HTTP_NOT_FOUND = 404;
|
|
@@ -137,7 +138,6 @@ class SaasWorkspacesController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
137
138
|
...input.billingProfile,
|
|
138
139
|
email: user.email,
|
|
139
140
|
fallbackName: user.name,
|
|
140
|
-
paymentMethodId: input.paymentMethodId,
|
|
141
141
|
},
|
|
142
142
|
card: input.card,
|
|
143
143
|
handles,
|
|
@@ -173,7 +173,11 @@ class SaasWorkspacesController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
173
173
|
const tenant = await this.tenantModel.get(id);
|
|
174
174
|
(0, interface_api_util_1.assert)(tenant, HTTP_NOT_FOUND, "saas.errors.workspace.not_found");
|
|
175
175
|
const { subscription, billingInfo, members, invoices, creditNotes, plan } = await loadWorkspaceRelations(id, this.planModel);
|
|
176
|
-
const memberRows = await
|
|
176
|
+
const [memberRows, pendingInvitationsCount, seats] = await Promise.all([
|
|
177
|
+
buildMemberRows(members, this.userModel),
|
|
178
|
+
(0, workspaces_1.countPendingInvitations)(id),
|
|
179
|
+
(0, plans_1.getSeatUsage)(id),
|
|
180
|
+
]);
|
|
177
181
|
const projection = (0, utils_1.buildWorkspaceProjection)({
|
|
178
182
|
tenant,
|
|
179
183
|
subscription,
|
|
@@ -192,7 +196,9 @@ class SaasWorkspacesController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
192
196
|
planName: projection.planName,
|
|
193
197
|
currency: projection.currency,
|
|
194
198
|
mrr: projection.mrr,
|
|
195
|
-
membersCount:
|
|
199
|
+
membersCount: seats.members,
|
|
200
|
+
platformSupportCount: seats.platformSupport.length,
|
|
201
|
+
pendingInvitationsCount,
|
|
196
202
|
subscription: subscription ?? null,
|
|
197
203
|
billingInfo: billingInfo ?? null,
|
|
198
204
|
members: memberRows,
|
|
@@ -259,7 +265,7 @@ __decorate([
|
|
|
259
265
|
], SaasWorkspacesController.prototype, "createMine", null);
|
|
260
266
|
__decorate([
|
|
261
267
|
(0, interface_api_1.Get)("/current"),
|
|
262
|
-
__param(0, (0, guards_1.AuthTenantOwner)()),
|
|
268
|
+
__param(0, (0, guards_1.AuthTenantOwner)({ bypassTenantAccessGate: true })),
|
|
263
269
|
__param(1, (0, interface_api_1.Context)()),
|
|
264
270
|
__metadata("design:type", Function),
|
|
265
271
|
__metadata("design:paramtypes", [Function, Object]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../src/routes/tenant/workspaces.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAUmC;AACnC,uEAAwD;AACxD,uEAAgE;AAChE,6FAA4E;AAC5E,qDAIsC;AACtC,6DAAmE;AACnE,6EAA8E;AAC9E,iFAAkF;AAClF,yDAA4E;AAC5E,0DAAyE;AACzE,iCAYkB;AAClB,yCAA2E;AAC3E,yCAAmD;AACnD,uCAAuD;AAQvD,
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../src/routes/tenant/workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type Stripe from "stripe";
|
|
2
|
+
export interface StripeSubscriptionCycle {
|
|
3
|
+
currency: string;
|
|
4
|
+
currentPeriodStart: Date;
|
|
5
|
+
currentPeriodEnd: Date;
|
|
6
|
+
}
|
|
7
|
+
export interface QuotedInvoiceItem {
|
|
8
|
+
amountMinorUnits: number;
|
|
9
|
+
description: string;
|
|
10
|
+
periodStart: Date;
|
|
11
|
+
periodEnd: Date;
|
|
12
|
+
metadata: Record<string, string>;
|
|
13
|
+
}
|
|
14
|
+
export interface UpcomingInvoicePreviewRequest {
|
|
15
|
+
customerId: string;
|
|
16
|
+
subscriptionId: string;
|
|
17
|
+
currency: string;
|
|
18
|
+
quotedItems: QuotedInvoiceItem[];
|
|
19
|
+
}
|
|
20
|
+
export declare function retrieveStripeSubscriptionCycle(subscriptionId: string): Promise<StripeSubscriptionCycle>;
|
|
21
|
+
export declare function previewStripeUpcomingInvoice(request: UpcomingInvoicePreviewRequest): Promise<Stripe.Invoice>;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.retrieveStripeSubscriptionCycle = retrieveStripeSubscriptionCycle;
|
|
4
|
+
exports.previewStripeUpcomingInvoice = previewStripeUpcomingInvoice;
|
|
5
|
+
const client_1 = require("./client");
|
|
6
|
+
const MS_PER_SECOND = 1000;
|
|
7
|
+
const TAX_RATE_EXPANSION = "total_tax_amounts.tax_rate";
|
|
8
|
+
function toStripeSeconds(date) {
|
|
9
|
+
return Math.floor(date.getTime() / MS_PER_SECOND);
|
|
10
|
+
}
|
|
11
|
+
function fromStripeSeconds(seconds) {
|
|
12
|
+
return new Date(seconds * MS_PER_SECOND);
|
|
13
|
+
}
|
|
14
|
+
function toPreviewInvoiceItem(currency, item) {
|
|
15
|
+
return {
|
|
16
|
+
amount: item.amountMinorUnits,
|
|
17
|
+
currency,
|
|
18
|
+
description: item.description,
|
|
19
|
+
period: {
|
|
20
|
+
start: toStripeSeconds(item.periodStart),
|
|
21
|
+
end: toStripeSeconds(item.periodEnd),
|
|
22
|
+
},
|
|
23
|
+
metadata: item.metadata,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
async function retrieveStripeSubscriptionCycle(subscriptionId) {
|
|
27
|
+
const subscription = await (0, client_1.getStripeClient)().subscriptions.retrieve(subscriptionId);
|
|
28
|
+
return {
|
|
29
|
+
currency: subscription.currency,
|
|
30
|
+
currentPeriodStart: fromStripeSeconds(subscription.current_period_start),
|
|
31
|
+
currentPeriodEnd: fromStripeSeconds(subscription.current_period_end),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
async function previewStripeUpcomingInvoice(request) {
|
|
35
|
+
return (0, client_1.getStripeClient)().invoices.createPreview({
|
|
36
|
+
customer: request.customerId,
|
|
37
|
+
subscription: request.subscriptionId,
|
|
38
|
+
invoice_items: request.quotedItems.map((item) => toPreviewInvoiceItem(request.currency, item)),
|
|
39
|
+
expand: [TAX_RATE_EXPANSION],
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=upcoming-invoice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upcoming-invoice.js","sourceRoot":"","sources":["../../src/stripe/upcoming-invoice.ts"],"names":[],"mappings":";;AAuDA,0EAUC;AAOD,oEAWC;AAlFD,qCAA2C;AAE3C,MAAM,aAAa,GAAG,IAAI,CAAC;AAC3B,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AA0BxD,SAAS,eAAe,CAAC,IAAU;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAgB,EAChB,IAAuB;IAEvB,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,gBAAgB;QAC7B,QAAQ;QACR,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE;YACN,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC;YACxC,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC;SACrC;QACD,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC;AACJ,CAAC;AAGM,KAAK,UAAU,+BAA+B,CACnD,cAAsB;IAEtB,MAAM,YAAY,GAChB,MAAM,IAAA,wBAAe,GAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACjE,OAAO;QACL,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,kBAAkB,EAAE,iBAAiB,CAAC,YAAY,CAAC,oBAAoB,CAAC;QACxE,gBAAgB,EAAE,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CAAC;KACrE,CAAC;AACJ,CAAC;AAOM,KAAK,UAAU,4BAA4B,CAChD,OAAsC;IAEtC,OAAO,IAAA,wBAAe,GAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC9C,QAAQ,EAAE,OAAO,CAAC,UAAU;QAC5B,YAAY,EAAE,OAAO,CAAC,cAAc;QACpC,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,oBAAoB,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAC7C;QACD,MAAM,EAAE,CAAC,kBAAkB,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.dispatchStripeWebhookEvent = dispatchStripeWebhookEvent;
|
|
4
4
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
5
|
const db_1 = require("../db");
|
|
6
|
+
const invalidation_1 = require("../upcoming-invoice/invalidation");
|
|
6
7
|
const webhook_handlers_1 = require("./webhook-handlers");
|
|
7
8
|
const webhook_checkout_1 = require("./webhook-checkout");
|
|
8
9
|
const webhook_credit_notes_1 = require("./webhook-credit-notes");
|
|
@@ -40,6 +41,7 @@ async function dispatchStripeWebhookEvent(event) {
|
|
|
40
41
|
await stripeWebhookEventModel.markResult(event.id, claimed, "reconciliation_required", message);
|
|
41
42
|
throw error;
|
|
42
43
|
}
|
|
44
|
+
await (0, invalidation_1.invalidatePreviewForStripeEvent)(event);
|
|
43
45
|
await stripeWebhookEventModel.markResult(event.id, claimed, "success", null);
|
|
44
46
|
}
|
|
45
47
|
//# sourceMappingURL=webhook-dispatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-dispatch.js","sourceRoot":"","sources":["../../src/stripe/webhook-dispatch.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"webhook-dispatch.js","sourceRoot":"","sources":["../../src/stripe/webhook-dispatch.ts"],"names":[],"mappings":";;AA4CA,gEAgCC;AA5ED,6FAAqE;AAErE,8BAAgD;AAChD,mEAAmF;AACnF,yDAW4B;AAC5B,yDAG4B;AAC5B,iEAGgC;AAIhC,MAAM,QAAQ,GAAmC;IAC/C,4BAA4B,EAAE,iDAA8B;IAC5D,0BAA0B,EAAE,+CAA4B;IACxD,iBAAiB,EAAE,uCAAoB;IACvC,mBAAmB,EAAE,yCAAsB;IAC3C,cAAc,EAAE,oCAAiB;IACjC,gBAAgB,EAAE,sCAAmB;IACrC,wBAAwB,EAAE,6CAA0B;IACpD,qBAAqB,EAAE,8CAAuB;IAC9C,oBAAoB,EAAE,6CAAsB;IAC5C,uBAAuB,EAAE,4CAAyB;IAClD,kBAAkB,EAAE,wCAAqB;IACzC,+BAA+B,EAAE,4CAAyB;IAC1D,sCAAsC,EAAE,qCAAkB;IAC1D,+BAA+B,EAAE,4CAAyB;CAC3D,CAAC;AAEK,KAAK,UAAU,0BAA0B,CAC9C,KAAmB;IAEnB,MAAM,uBAAuB,GAAG,IAAA,wCAAQ,EAAC,4BAAuB,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7E,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,uBAAuB,CAAC,UAAU,CACtC,KAAK,CAAC,EAAE,EACR,OAAO,EACP,SAAS,EACT,IAAI,CACL,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,uBAAuB,CAAC,UAAU,CACtC,KAAK,CAAC,EAAE,EACR,OAAO,EACP,yBAAyB,EACzB,OAAO,CACR,CAAC;QACF,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,IAAA,8CAA+B,EAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,uBAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}
|
package/dist/types/config.d.ts
CHANGED
|
@@ -7,10 +7,19 @@ export interface DmsSaasPublicScreensConfig {
|
|
|
7
7
|
register?: boolean;
|
|
8
8
|
}
|
|
9
9
|
export type PublicScreenId = keyof DmsSaasPublicScreensConfig;
|
|
10
|
+
export declare const REGISTRATION_PAYMENT_METHOD_POLICIES: readonly ["required", "optional", "none"];
|
|
11
|
+
export type RegistrationPaymentMethodPolicy = (typeof REGISTRATION_PAYMENT_METHOD_POLICIES)[number];
|
|
12
|
+
export declare const DEFAULT_REGISTRATION_PAYMENT_METHOD_POLICY: RegistrationPaymentMethodPolicy;
|
|
13
|
+
export interface DmsSaasRegistrationConfig {
|
|
14
|
+
paymentMethod?: RegistrationPaymentMethodPolicy;
|
|
15
|
+
}
|
|
10
16
|
export interface DmsSaasConfig {
|
|
11
17
|
stripe: DmsSaasStripeConfig;
|
|
12
18
|
admissionMode?: "open" | "invitation-only";
|
|
19
|
+
registration?: DmsSaasRegistrationConfig;
|
|
13
20
|
supportStorage?: string;
|
|
14
21
|
publicScreens?: DmsSaasPublicScreensConfig;
|
|
15
22
|
allowedRedirectHosts?: string[];
|
|
23
|
+
defaultPlanSlug?: string;
|
|
24
|
+
upcomingInvoicePreviewCacheTtlSeconds?: number;
|
|
16
25
|
}
|
package/dist/types/config.js
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_REGISTRATION_PAYMENT_METHOD_POLICY = exports.REGISTRATION_PAYMENT_METHOD_POLICIES = void 0;
|
|
4
|
+
exports.REGISTRATION_PAYMENT_METHOD_POLICIES = [
|
|
5
|
+
"required",
|
|
6
|
+
"optional",
|
|
7
|
+
"none",
|
|
8
|
+
];
|
|
9
|
+
exports.DEFAULT_REGISTRATION_PAYMENT_METHOD_POLICY = "required";
|
|
3
10
|
//# sourceMappingURL=config.js.map
|
package/dist/types/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":";;;AAsBa,QAAA,oCAAoC,GAAG;IAClD,UAAU;IACV,UAAU;IACV,MAAM;CACE,CAAC;AAME,QAAA,0CAA0C,GACrD,UAAU,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { UpcomingInvoicePreview } from "@antelopejs/interface-dms-saas/billing";
|
|
2
|
+
import { UpcomingInvoicePreviewEntry } from "./preview-cache.table";
|
|
3
|
+
export interface PreviewCacheLookup {
|
|
4
|
+
tenantId: string;
|
|
5
|
+
sourceVersion: string;
|
|
6
|
+
computedNotBefore: Date;
|
|
7
|
+
}
|
|
8
|
+
export interface PreviewCacheWrite {
|
|
9
|
+
tenantId: string;
|
|
10
|
+
preview: UpcomingInvoicePreview;
|
|
11
|
+
sourceVersion: string;
|
|
12
|
+
computedAt: Date;
|
|
13
|
+
}
|
|
14
|
+
declare const UpcomingInvoicePreviewCacheModel_base: {
|
|
15
|
+
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
16
|
+
readonly table: import("@antelopejs/interface-database").Table<UpcomingInvoicePreviewEntry>;
|
|
17
|
+
readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
|
|
18
|
+
get(id: string): PromiseLike<UpcomingInvoicePreviewEntry | undefined>;
|
|
19
|
+
getBy(index: keyof UpcomingInvoicePreviewEntry, ...keys: any[]): PromiseLike<UpcomingInvoicePreviewEntry[]>;
|
|
20
|
+
getAll(): PromiseLike<UpcomingInvoicePreviewEntry[]>;
|
|
21
|
+
insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<UpcomingInvoicePreviewEntry> | import("@antelopejs/interface-database-decorators").DeepPartial<UpcomingInvoicePreviewEntry>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
|
|
22
|
+
update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<UpcomingInvoicePreviewEntry>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
|
|
23
|
+
update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<UpcomingInvoicePreviewEntry>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
|
|
24
|
+
delete(id: string): Promise<number>;
|
|
25
|
+
};
|
|
26
|
+
readonly schemaName: string;
|
|
27
|
+
fromPlainData(obj: any): UpcomingInvoicePreviewEntry;
|
|
28
|
+
fromDatabase(obj: any): UpcomingInvoicePreviewEntry | undefined;
|
|
29
|
+
toDatabase(obj: any): Record<string, any>;
|
|
30
|
+
validate(obj: unknown, options?: import("@antelopejs/interface-database-decorators").ValidateInputOptions): import("@antelopejs/interface-database-decorators").ValidationResult;
|
|
31
|
+
};
|
|
32
|
+
export declare class UpcomingInvoicePreviewCacheModel extends UpcomingInvoicePreviewCacheModel_base {
|
|
33
|
+
readFresh(lookup: PreviewCacheLookup): Promise<UpcomingInvoicePreview | null>;
|
|
34
|
+
store(write: PreviewCacheWrite): Promise<void>;
|
|
35
|
+
invalidate(tenantId: string, at: Date): Promise<void>;
|
|
36
|
+
private upsert;
|
|
37
|
+
}
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UpcomingInvoicePreviewCacheModel = void 0;
|
|
4
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
|
+
const preview_cache_table_1 = require("./preview-cache.table");
|
|
6
|
+
const EMPTY_ENTRY = {
|
|
7
|
+
preview: null,
|
|
8
|
+
sourceVersion: null,
|
|
9
|
+
computedAt: null,
|
|
10
|
+
invalidatedAt: null,
|
|
11
|
+
};
|
|
12
|
+
function timeOf(date) {
|
|
13
|
+
return date ? new Date(date).getTime() : null;
|
|
14
|
+
}
|
|
15
|
+
function isFresh(entry, lookup) {
|
|
16
|
+
const computedAt = timeOf(entry.computedAt);
|
|
17
|
+
if (!entry.preview || computedAt === null)
|
|
18
|
+
return false;
|
|
19
|
+
if (entry.sourceVersion !== lookup.sourceVersion)
|
|
20
|
+
return false;
|
|
21
|
+
if (computedAt < lookup.computedNotBefore.getTime())
|
|
22
|
+
return false;
|
|
23
|
+
const invalidatedAt = timeOf(entry.invalidatedAt);
|
|
24
|
+
return invalidatedAt === null || computedAt > invalidatedAt;
|
|
25
|
+
}
|
|
26
|
+
class UpcomingInvoicePreviewCacheModel extends (0, interface_database_decorators_1.BasicDataModel)(preview_cache_table_1.UpcomingInvoicePreviewEntry, preview_cache_table_1.upcomingInvoicePreviewsTableName) {
|
|
27
|
+
async readFresh(lookup) {
|
|
28
|
+
const entry = await this.get(lookup.tenantId);
|
|
29
|
+
return entry && isFresh(entry, lookup) ? entry.preview : null;
|
|
30
|
+
}
|
|
31
|
+
async store(write) {
|
|
32
|
+
await this.upsert(write.tenantId, {
|
|
33
|
+
preview: write.preview,
|
|
34
|
+
sourceVersion: write.sourceVersion,
|
|
35
|
+
computedAt: write.computedAt,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
async invalidate(tenantId, at) {
|
|
39
|
+
await this.upsert(tenantId, { invalidatedAt: at });
|
|
40
|
+
}
|
|
41
|
+
async upsert(tenantId, patch) {
|
|
42
|
+
if (await this.get(tenantId)) {
|
|
43
|
+
await this.update(tenantId, patch);
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
try {
|
|
47
|
+
await this.insert({ ...EMPTY_ENTRY, ...patch, _id: tenantId });
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (!(await this.get(tenantId)))
|
|
51
|
+
throw error;
|
|
52
|
+
await this.update(tenantId, patch);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
exports.UpcomingInvoicePreviewCacheModel = UpcomingInvoicePreviewCacheModel;
|
|
57
|
+
//# sourceMappingURL=preview-cache.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preview-cache.model.js","sourceRoot":"","sources":["../../../src/upcoming-invoice/db/preview-cache.model.ts"],"names":[],"mappings":";;;AACA,6FAA2E;AAC3E,+DAG+B;AAmB/B,MAAM,WAAW,GAAe;IAC9B,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,IAAI;CACpB,CAAC;AAEF,SAAS,MAAM,CAAC,IAA6B;IAC3C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAChD,CAAC;AAED,SAAS,OAAO,CACd,KAAkC,EAClC,MAA0B;IAE1B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,KAAK,CAAC,aAAa,KAAK,MAAM,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IAC/D,IAAI,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE;QAAE,OAAO,KAAK,CAAC;IAClE,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAClD,OAAO,aAAa,KAAK,IAAI,IAAI,UAAU,GAAG,aAAa,CAAC;AAC9D,CAAC;AAGD,MAAa,gCAAiC,SAAQ,IAAA,8CAAc,EAClE,iDAA2B,EAC3B,sDAAgC,CACjC;IACC,KAAK,CAAC,SAAS,CACb,MAA0B;QAE1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9C,OAAO,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAChE,CAAC;IAGD,KAAK,CAAC,KAAK,CAAC,KAAwB;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE;YAChC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,EAAQ;QACzC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,KAAiB;QACtD,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAAE,MAAM,KAAK,CAAC;YAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;CACF;AApCD,4EAoCC"}
|