@antelopejs/dms-saas 0.3.12 → 0.3.14
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/pages/platform/settings.js +0 -6
- package/dist/pages/platform/settings.js.map +1 -1
- package/dist/routes/platformOwner/billing-settings.d.ts +24 -3
- package/dist/routes/platformOwner/billing-settings.js +0 -3
- package/dist/routes/platformOwner/billing-settings.js.map +1 -1
- package/dist/routes/tenant/workspaces.d.ts +2 -5
- package/dist/routes/tenant/workspaces.js +8 -4
- package/dist/routes/tenant/workspaces.js.map +1 -1
- package/dist/upcoming-invoice/eligibility.js +2 -2
- package/dist/upcoming-invoice/eligibility.js.map +1 -1
- package/dist/workspaces/db/provisioning-attempt.table.d.ts +0 -1
- package/dist/workspaces/db/provisioning-attempt.table.js +0 -4
- package/dist/workspaces/db/provisioning-attempt.table.js.map +1 -1
- package/dist/workspaces/default-plan.js +2 -2
- package/dist/workspaces/default-plan.js.map +1 -1
- package/dist/workspaces/free-plan.d.ts +2 -0
- package/dist/workspaces/free-plan.js +8 -0
- package/dist/workspaces/free-plan.js.map +1 -0
- package/dist/workspaces/index.d.ts +1 -1
- package/dist/workspaces/index.js +1 -1
- package/dist/workspaces/index.js.map +1 -1
- package/dist/workspaces/provisioning-state.js +0 -19
- package/dist/workspaces/provisioning-state.js.map +1 -1
- package/dist/workspaces/provisioning.js +2 -2
- package/dist/workspaces/provisioning.js.map +1 -1
- package/frontend-vue/app/components/PaymentMethodCard.vue +33 -1
- package/frontend-vue/app/components/WorkspaceCreateModal.vue +60 -60
- package/frontend-vue/app/composables/useComplimentaryAccess.ts +23 -0
- package/frontend-vue/i18n/locales/saas-en-GB.json +5 -7
- package/frontend-vue/i18n/locales/saas-fr-FR.json +5 -7
- package/package.json +1 -1
- package/dist/workspaces/db/card-capacity.model.d.ts +0 -30
- package/dist/workspaces/db/card-capacity.model.js +0 -98
- package/dist/workspaces/db/card-capacity.model.js.map +0 -1
- package/dist/workspaces/db/card-capacity.table.d.ts +0 -11
- package/dist/workspaces/db/card-capacity.table.js +0 -34
- package/dist/workspaces/db/card-capacity.table.js.map +0 -1
- package/dist/workspaces/free-workspace-guard.d.ts +0 -11
- package/dist/workspaces/free-workspace-guard.js +0 -96
- package/dist/workspaces/free-workspace-guard.js.map +0 -1
|
@@ -39,12 +39,6 @@ const billingForm = (0, base_1.Form)({
|
|
|
39
39
|
description: "$saas.settings.billing.data_retention_days_desc",
|
|
40
40
|
type: new default_types_1.DefaultDataTypes.NumberType({ min: 0 }),
|
|
41
41
|
},
|
|
42
|
-
{
|
|
43
|
-
id: "maxFreeWorkspacesPerCard",
|
|
44
|
-
label: "$saas.settings.billing.max_free_workspaces_per_card",
|
|
45
|
-
description: "$saas.settings.billing.max_free_workspaces_per_card_desc",
|
|
46
|
-
type: new default_types_1.DefaultDataTypes.NumberType({ min: 0 }),
|
|
47
|
-
},
|
|
48
42
|
{
|
|
49
43
|
id: "stripeTaxCode",
|
|
50
44
|
label: "$saas.settings.billing.stripe_tax_code",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/pages/platform/settings.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAA8E;AAC9E,yDAA2D;AAC3D,2FAA2F;AAC3F,oEAAuE;AACvE,sCAA2C;AAC3C,6CAAqD;AAErD,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;AACvD,MAAM,eAAe,GAAG,2BAA2B,CAAC;AAEpD,MAAM,mBAAmB,GAAG;IAC1B,EAAE,KAAK,EAAE,iCAAiC,EAAE,KAAK,EAAE,MAAM,EAAE;IAC3D,EAAE,KAAK,EAAE,qCAAqC,EAAE,KAAK,EAAE,UAAU,EAAE;CACpE,CAAC;AAEF,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC;IACvB,MAAM,EAAE;QACN;YACE,EAAE,EAAE,oBAAoB;YACxB,KAAK,EAAE,6CAA6C;YACpD,WAAW,EAAE,kDAAkD;YAC/D,IAAI,EAAE,IAAI,gCAAgB,CAAC,WAAW,EAAE;SACzC;QACD;YACE,EAAE,EAAE,sBAAsB;YAC1B,KAAK,EAAE,gDAAgD;YACvD,WAAW,EAAE,qDAAqD;YAClE,IAAI,EAAE,IAAI,gCAAgB,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAClD;QACD;YACE,EAAE,EAAE,oCAAoC;YACxC,KAAK,EAAE,4CAA4C;YACnD,WAAW,EAAE,iDAAiD;YAC9D,IAAI,EAAE,IAAI,gCAAgB,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAClD;QACD;YACE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/pages/platform/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ interface BillingSettingsBody {
|
|
|
4
4
|
autoSuspendEnabled?: boolean;
|
|
5
5
|
autoSuspendDelayDays?: number;
|
|
6
6
|
dataRetentionDaysAfterCancellation?: number;
|
|
7
|
-
maxFreeWorkspacesPerCard?: number;
|
|
8
7
|
moneyBackGuaranteeEnabled?: boolean;
|
|
9
8
|
moneyBackGuaranteeWindowDays?: number;
|
|
10
9
|
moneyBackGuaranteeMode?: RefundProrataMode;
|
|
@@ -14,7 +13,29 @@ interface BillingSettingsBody {
|
|
|
14
13
|
declare const SaasBillingSettingsController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
15
14
|
export declare class SaasBillingSettingsController extends SaasBillingSettingsController_base {
|
|
16
15
|
billingSettingsModel: BillingSettingsModel;
|
|
17
|
-
get(_user: User): Promise<import("@antelopejs/interface-dms-saas/db").BillingSettings
|
|
18
|
-
|
|
16
|
+
get(_user: User): Promise<import("@antelopejs/interface-dms-saas/db").BillingSettings | {
|
|
17
|
+
_id: string;
|
|
18
|
+
autoSuspendEnabled: boolean;
|
|
19
|
+
autoSuspendDelayDays: number;
|
|
20
|
+
dataRetentionDaysAfterCancellation: number;
|
|
21
|
+
moneyBackGuaranteeEnabled: boolean;
|
|
22
|
+
moneyBackGuaranteeWindowDays: number;
|
|
23
|
+
moneyBackGuaranteeMode: "full" | "prorated";
|
|
24
|
+
autoProrataOnCancelEnabled: boolean;
|
|
25
|
+
stripeTaxCode: string;
|
|
26
|
+
updatedAt: Date;
|
|
27
|
+
}>;
|
|
28
|
+
update(_user: User, body: BillingSettingsBody): Promise<import("@antelopejs/interface-dms-saas/db").BillingSettings | {
|
|
29
|
+
_id: string;
|
|
30
|
+
autoSuspendEnabled: boolean;
|
|
31
|
+
autoSuspendDelayDays: number;
|
|
32
|
+
dataRetentionDaysAfterCancellation: number;
|
|
33
|
+
moneyBackGuaranteeEnabled: boolean;
|
|
34
|
+
moneyBackGuaranteeWindowDays: number;
|
|
35
|
+
moneyBackGuaranteeMode: "full" | "prorated";
|
|
36
|
+
autoProrataOnCancelEnabled: boolean;
|
|
37
|
+
stripeTaxCode: string;
|
|
38
|
+
updatedAt: Date;
|
|
39
|
+
}>;
|
|
19
40
|
}
|
|
20
41
|
export {};
|
|
@@ -28,8 +28,6 @@ function pickBillingSettingsUpdate(body) {
|
|
|
28
28
|
if (body.dataRetentionDaysAfterCancellation !== undefined)
|
|
29
29
|
out.dataRetentionDaysAfterCancellation =
|
|
30
30
|
body.dataRetentionDaysAfterCancellation;
|
|
31
|
-
if (body.maxFreeWorkspacesPerCard !== undefined)
|
|
32
|
-
out.maxFreeWorkspacesPerCard = body.maxFreeWorkspacesPerCard;
|
|
33
31
|
if (body.moneyBackGuaranteeEnabled !== undefined)
|
|
34
32
|
out.moneyBackGuaranteeEnabled = body.moneyBackGuaranteeEnabled;
|
|
35
33
|
if (body.moneyBackGuaranteeWindowDays !== undefined)
|
|
@@ -51,7 +49,6 @@ async function getOrCreateBillingSettings(billingSettingsModel) {
|
|
|
51
49
|
autoSuspendEnabled: true,
|
|
52
50
|
autoSuspendDelayDays: db_1.DEFAULT_AUTO_SUSPEND_DELAY_DAYS,
|
|
53
51
|
dataRetentionDaysAfterCancellation: db_1.DEFAULT_DATA_RETENTION_DAYS,
|
|
54
|
-
maxFreeWorkspacesPerCard: db_1.DEFAULT_MAX_FREE_WORKSPACES_PER_CARD,
|
|
55
52
|
moneyBackGuaranteeEnabled: false,
|
|
56
53
|
moneyBackGuaranteeWindowDays: DEFAULT_MONEY_BACK_WINDOW_DAYS,
|
|
57
54
|
moneyBackGuaranteeMode: DEFAULT_REFUND_MODE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing-settings.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/billing-settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAA2E;AAC3E,6FAAkE;AAClE,yDAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"billing-settings.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/billing-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,13 @@ import { TenantModel } from "@antelopejs/interface-dms/db";
|
|
|
3
3
|
import { type User, UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
4
4
|
import { type CreditNote, type Invoice, PlanModel, type TenantBillingInfo, type TenantSubscription } from "../../db";
|
|
5
5
|
import { type CardSetupIntent } from "../../stripe";
|
|
6
|
-
import type {
|
|
6
|
+
import type { WorkspaceDeletionResult } from "../../workspaces";
|
|
7
7
|
interface MyWorkspaceRow {
|
|
8
8
|
_id: string;
|
|
9
9
|
name: string;
|
|
10
10
|
planName: string | null;
|
|
11
11
|
isCurrent: boolean;
|
|
12
12
|
}
|
|
13
|
-
interface WorkspaceCreateOptions {
|
|
14
|
-
freePlan: FreePlanAvailability;
|
|
15
|
-
}
|
|
16
13
|
interface WorkspaceCreateBody {
|
|
17
14
|
workspaceName?: string;
|
|
18
15
|
planId: string;
|
|
@@ -48,7 +45,7 @@ export declare class SaasWorkspacesController extends SaasWorkspacesController_b
|
|
|
48
45
|
planModel: PlanModel;
|
|
49
46
|
private resolveSubscriptionSummaries;
|
|
50
47
|
listMine(user: User, ctx: RequestContext): Promise<MyWorkspaceRow[]>;
|
|
51
|
-
createOptions(user: User): Promise<
|
|
48
|
+
createOptions(user: User): Promise<void>;
|
|
52
49
|
setupIntent(user: User): Promise<CardSetupIntent>;
|
|
53
50
|
private prepareSelfServeCreation;
|
|
54
51
|
createMine(user: User, ctx: RequestContext, body: WorkspaceCreateBody): Promise<CreatedWorkspace>;
|
|
@@ -33,6 +33,13 @@ const HTTP_NOT_FOUND = 404;
|
|
|
33
33
|
const HTTP_CONFLICT = 409;
|
|
34
34
|
const HTTP_BAD_REQUEST = 400;
|
|
35
35
|
const CANCELLED_STATUS = "cancelled";
|
|
36
|
+
function assertPaymentReadiness(plan, paymentMethodId, billingProfile) {
|
|
37
|
+
if (paymentMethodId) {
|
|
38
|
+
(0, workspaces_1.assertBillingCountry)(billingProfile.address);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
(0, interface_api_util_1.assert)((0, workspaces_1.isFreePlan)(plan), HTTP_BAD_REQUEST, "saas.errors.workspace.payment_method_required");
|
|
42
|
+
}
|
|
36
43
|
async function buildMemberRows(members, userModel) {
|
|
37
44
|
const memberUsers = await Promise.all(members.map((m) => userModel.get(m.userId)));
|
|
38
45
|
return members.map((m, i) => ({
|
|
@@ -98,7 +105,6 @@ class SaasWorkspacesController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
98
105
|
}
|
|
99
106
|
async createOptions(user) {
|
|
100
107
|
(0, config_1.assertAdmissionOpen)(user.owner);
|
|
101
|
-
return { freePlan: await (0, workspaces_1.resolveFreePlanAvailabilityForUser)(user._id) };
|
|
102
108
|
}
|
|
103
109
|
async setupIntent(user) {
|
|
104
110
|
(0, config_1.assertAdmissionOpen)(user.owner);
|
|
@@ -108,12 +114,10 @@ class SaasWorkspacesController extends (0, interface_api_1.Controller)("/api/saa
|
|
|
108
114
|
(0, config_1.assertAdmissionOpen)(user.owner);
|
|
109
115
|
const workspaceName = body.workspaceName?.trim();
|
|
110
116
|
(0, interface_api_util_1.assert)(workspaceName, HTTP_BAD_REQUEST, "saas.errors.workspace.name_required");
|
|
111
|
-
(0, interface_api_util_1.assert)(body.paymentMethodId, HTTP_BAD_REQUEST, "saas.errors.workspace.payment_method_required");
|
|
112
117
|
const card = await (0, workspaces_1.resolveCardDetails)(body.paymentMethodId);
|
|
113
118
|
const billingProfile = await (0, workspaces_1.resolveBillingProfileForNewWorkspace)(user._id, card, (0, request_tenant_1.getRequestTenantId)(ctx));
|
|
114
|
-
(0, workspaces_1.assertBillingCountry)(billingProfile.address);
|
|
115
119
|
const plan = await (0, workspaces_1.ensurePlanIsAvailableForCustomer)(body.planId, billingProfile.customerType);
|
|
116
|
-
|
|
120
|
+
assertPaymentReadiness(plan, body.paymentMethodId, billingProfile);
|
|
117
121
|
return {
|
|
118
122
|
workspaceName,
|
|
119
123
|
paymentMethodId: body.paymentMethodId,
|
|
@@ -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,uCAA2C;AAC3C,uCAAuD;
|
|
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,uCAA2C;AAC3C,uCAAuD;AAOvD,iDAW0B;AAE1B,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAE7B,MAAM,gBAAgB,GAA6B,WAAW,CAAC;AAiC/D,SAAS,sBAAsB,CAC7B,IAAU,EACV,eAAmC,EACnC,cAAuC;IAEvC,IAAI,eAAe,EAAE,CAAC;QACpB,IAAA,iCAAoB,EAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IACD,IAAA,2BAAM,EACJ,IAAA,uBAAU,EAAC,IAAI,CAAC,EAChB,gBAAgB,EAChB,+CAA+C,CAChD,CAAC;AACJ,CAAC;AA8BD,KAAK,UAAU,eAAe,CAC5B,OAAuB,EACvB,SAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAC5C,CAAC;IACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5B,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,MAAM;QACxC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,IAAI;QAClC,aAAa,EAAE,CAAC,CAAC,aAAa;QAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAmB;IAEnB,OAAO,KAAK;SACT,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AACnE,CAAC;AAWD,KAAK,UAAU,sBAAsB,CACnC,QAAgB,EAChB,SAAoB;IAEpB,MAAM,uBAAuB,GAAG,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,CAAC;IAC5E,MAAM,sBAAsB,GAAG,IAAA,wCAAQ,EAAC,2BAAsB,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,IAAA,wCAAQ,EAAC,sBAAiB,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,wCAAQ,EAAC,iBAAY,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,IAAA,wCAAQ,EAAC,oBAAe,EAAE,QAAQ,CAAC,CAAC;IAC5D,MAAM,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,GAC/D,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,uBAAuB,CAAC,OAAO,EAAE;QACjC,sBAAsB,CAAC,OAAO,EAAE;QAChC,WAAW,CAAC,OAAO,EAAE;QACrB,YAAY,CAAC,cAAc,EAAE;QAC7B,eAAe,CAAC,MAAM,EAAE;KACzB,CAAC,CAAC;IACL,MAAM,IAAI,GAAG,YAAY,EAAE,MAAM;QAC/B,CAAC,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC;QACtD,CAAC,CAAC,IAAI,CAAC;IACT,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAC7E,CAAC;AAED,MAAa,wBAAyB,SAAQ,IAAA,0BAAU,EACtD,sBAAsB,CACvB;IAUS,KAAK,CAAC,4BAA4B,CACxC,SAAmB;QAEnB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACzB,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,CAAC,OAAO,EAAE,CACtD,CACF,CAAC;QAMF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAE7B,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CACjC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CACtE,CACF,CAAC;QACF,OAAO,IAAI,GAAG,CACZ,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;YACjC,QAAQ;YACR;gBACE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,IAAI;gBACpC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,IAAI;aAC7C;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CACG,IAAU,EACd,GAAmB;QAE9B,MAAM,eAAe,GAAG,IAAA,mCAAkB,EAAC,GAAG,CAAC,CAAC;QAEhD,MAAM,WAAW,GAAG,IAAA,wCAAQ,EAAC,sBAAiB,EAAE,mCAAc,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAC5C,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CACnC,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACvD,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CACpC,CAAC;QACF,OAAO,CACL,OAAO;aAGJ,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,gBAAgB,CACnE;aACA,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,IAAI,IAAI;YACrD,SAAS,EAAE,MAAM,CAAC,GAAG,KAAK,eAAe;SAC1C,CAAC,CAAC,CACN,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAAgB,IAAU;QAC3C,IAAA,4BAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAgB,IAAU;QACzC,IAAA,4BAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,IAAA,8BAAqB,GAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACpC,IAAU,EACV,GAAmB,EACnB,IAAyB;QAEzB,IAAA,4BAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;QACjD,IAAA,2BAAM,EACJ,aAAa,EACb,gBAAgB,EAChB,qCAAqC,CACtC,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAA,+BAAkB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAG,MAAM,IAAA,iDAAoC,EAC/D,IAAI,CAAC,GAAG,EACR,IAAI,EACJ,IAAA,mCAAkB,EAAC,GAAG,CAAC,CACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAA,6CAAgC,EACjD,IAAI,CAAC,MAAM,EACX,cAAc,CAAC,YAAY,CAC5B,CAAC;QACF,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QACnE,OAAO;YACL,aAAa;YACb,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI;YACJ,cAAc;SACf,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CACC,IAAU,EACd,GAAmB,EAClB,IAAyB;QAErC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,OAAO,GAAiC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC;QACnE,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,+BAAkB,EAAC;gBAC5C,MAAM,EAAE,IAAI,CAAC,GAAG;gBAChB,OAAO,EAAE;oBACP,GAAG,KAAK,CAAC,cAAc;oBACvB,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,eAAe,EAAE,KAAK,CAAC,eAAe;iBACvC;gBACD,qBAAqB,EAAE;oBACrB,GAAG,KAAK,CAAC,cAAc;oBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,YAAY,EAAE,IAAI,CAAC,IAAI;iBACxB;gBACD,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,OAAO;aACR,CAAC,CAAC;YACH,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAA,0CAA6B,EAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAQK,AAAN,KAAK,CAAC,UAAU,CACqC,KAAW,EACnD,GAAmB;QAE9B,MAAM,QAAQ,GAAG,IAAA,mCAAkB,EAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAA,2BAAM,EAAC,MAAM,EAAE,cAAc,EAAE,iCAAiC,CAAC,CAAC;QAClE,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,aAAa,EAAE,MAAM,IAAA,qCAAwB,GAAE;SAChD,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACE,KAAW,EACnB,GAAmB,EAClB,IAAyB;QAErC,MAAM,QAAQ,GAAG,IAAA,mCAAkB,EAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAC/B,IAAA,2BAAM,EAAC,IAAI,EAAE,gBAAgB,EAAE,qCAAqC,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QACzE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACE,KAAW,EACnB,GAAmB;QAE9B,OAAO,IAAA,qCAAwB,EAAC,IAAA,mCAAkB,EAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS,CAAkB,KAAW,EAAmB,EAAU;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAA,2BAAM,EAAC,MAAM,EAAE,cAAc,EAAE,iCAAiC,CAAC,CAAC;QAElE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,GACvE,MAAM,sBAAsB,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,CAAC,UAAU,EAAE,uBAAuB,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrE,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxC,IAAA,oCAAuB,EAAC,EAAE,CAAC;YAC3B,IAAA,oBAAY,EAAC,EAAE,CAAC;SACjB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,gCAAwB,EAAC;YAC1C,MAAM;YACN,YAAY;YACZ,WAAW;YACX,IAAI;YACJ,YAAY,EAAE,OAAO,CAAC,MAAM;YAC5B,QAAQ;YACR,GAAG,EAAE,IAAI,IAAI,EAAE;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,GAAG,EAAE,UAAU,CAAC,GAAG;YAGnB,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,oBAAoB,EAAE,KAAK,CAAC,eAAe,CAAC,MAAM;YAGlD,uBAAuB;YACvB,YAAY,EAAE,YAAY,IAAI,IAAI;YAClC,WAAW,EAAE,WAAW,IAAI,IAAI;YAChC,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;YACtC,WAAW,EAAE,kBAAkB,CAAC,WAAW,CAAC;SAC7C,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAkB,IAAU,EAAmB,EAAU;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAA,2BAAM,EAAC,MAAM,EAAE,cAAc,EAAE,iCAAiC,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,IAAA,wCAAQ,EAAC,sBAAiB,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAA,2BAAM,EAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,qCAAqC,CAAC,CAAC;QAExE,MAAM,IAAA,uCAAoB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE;YACvD,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;CACF;AA9PD,4DA8PC;AA1PS;IADP,IAAA,qCAAK,EAAC,gBAAW,CAAC;8BACE,gBAAW;6DAAC;AAGzB;IADP,IAAA,qCAAK,EAAC,cAAS,CAAC;8BACE,cAAS;2DAAC;AAGrB;IADP,IAAA,qCAAK,EAAC,cAAS,CAAC;8BACE,cAAS;2DAAC;AAiCvB;IADL,IAAA,mBAAG,EAAC,OAAO,CAAC;IAEV,WAAA,IAAA,kBAAW,GAAE,CAAA;IACb,WAAA,IAAA,uBAAO,GAAE,CAAA;;;;wDA4BX;AAIK;IADL,IAAA,mBAAG,EAAC,iBAAiB,CAAC;IACF,WAAA,IAAA,kBAAW,GAAE,CAAA;;;;6DAEjC;AAGK;IADL,IAAA,mBAAG,EAAC,eAAe,CAAC;IACF,WAAA,IAAA,kBAAW,GAAE,CAAA;;;;2DAG/B;AAmCK;IADL,IAAA,oBAAI,EAAC,GAAG,CAAC;IAEP,WAAA,IAAA,kBAAW,GAAE,CAAA;IACb,WAAA,IAAA,uBAAO,GAAE,CAAA;IACT,WAAA,IAAA,wBAAQ,GAAE,CAAA;;;;0DA0BZ;AAQK;IADL,IAAA,mBAAG,EAAC,UAAU,CAAC;IAEb,WAAA,IAAA,wBAAe,EAAC,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IACjD,WAAA,IAAA,uBAAO,GAAE,CAAA;;;;0DAUX;AAGK;IADL,IAAA,mBAAG,EAAC,UAAU,CAAC;IAEb,WAAA,IAAA,wBAAe,GAAE,CAAA;IACjB,WAAA,IAAA,uBAAO,GAAE,CAAA;IACT,WAAA,IAAA,wBAAQ,GAAE,CAAA;;;;6DAOZ;AAGK;IADL,IAAA,sBAAM,EAAC,UAAU,CAAC;IAEhB,WAAA,IAAA,wBAAe,GAAE,CAAA;IACjB,WAAA,IAAA,uBAAO,GAAE,CAAA;;;;6DAGX;AAGK;IADL,IAAA,mBAAG,EAAC,MAAM,CAAC;IACK,WAAA,IAAA,oBAAa,GAAE,CAAA;IAAe,WAAA,IAAA,yBAAS,EAAC,IAAI,CAAC,CAAA;;;;yDA4C7D;AAGK;IADL,IAAA,oBAAI,EAAC,WAAW,CAAC;IACE,WAAA,IAAA,oBAAa,GAAE,CAAA;IAAc,WAAA,IAAA,yBAAS,EAAC,IAAI,CAAC,CAAA;;;;4DAa/D"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.resolvePreviewEligibility = resolvePreviewEligibility;
|
|
4
4
|
const client_1 = require("../stripe/client");
|
|
5
5
|
const complimentary_1 = require("../workspaces/complimentary");
|
|
6
|
-
const
|
|
6
|
+
const free_plan_1 = require("../workspaces/free-plan");
|
|
7
7
|
const outcomes_1 = require("./outcomes");
|
|
8
8
|
const ELIGIBILITY_RULES = [
|
|
9
9
|
{
|
|
@@ -16,7 +16,7 @@ const ELIGIBILITY_RULES = [
|
|
|
16
16
|
},
|
|
17
17
|
{
|
|
18
18
|
outcome: (0, outcomes_1.absent)("free_plan"),
|
|
19
|
-
applies: (_subscription, plan) => !!plan && (0,
|
|
19
|
+
applies: (_subscription, plan) => !!plan && (0, free_plan_1.isFreePlan)(plan),
|
|
20
20
|
},
|
|
21
21
|
{
|
|
22
22
|
outcome: (0, outcomes_1.absent)("customer_not_configured"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eligibility.js","sourceRoot":"","sources":["../../src/upcoming-invoice/eligibility.ts"],"names":[],"mappings":";;AA6EA,8DAcC;AA1FD,6CAAsD;AACtD,+DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"eligibility.js","sourceRoot":"","sources":["../../src/upcoming-invoice/eligibility.ts"],"names":[],"mappings":";;AA6EA,8DAcC;AA1FD,6CAAsD;AACtD,+DAA0E;AAC1E,uDAAqD;AACrD,yCAAsE;AAkCtE,MAAM,iBAAiB,GAAsB;IAC3C;QACE,OAAO,EAAE,IAAA,iBAAM,EAAC,eAAe,CAAC;QAChC,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,IAAA,2CAA2B,EAAC,YAAY,CAAC;KACrE;IACD;QACE,OAAO,EAAE,IAAA,iBAAM,EAAC,6BAA6B,CAAC;QAC9C,OAAO,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI;KACxC;IACD;QACE,OAAO,EAAE,IAAA,iBAAM,EAAC,WAAW,CAAC;QAC5B,OAAO,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAA,sBAAU,EAAC,IAAI,CAAC;KAC7D;IACD;QACE,OAAO,EAAE,IAAA,iBAAM,EAAC,yBAAyB,CAAC;QAC1C,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,gBAAgB;KAC1D;CACF,CAAC;AAEF,SAAS,aAAa,CACpB,YAAgC;IAEhC,MAAM,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,GAAG,YAAY,CAAC;IAChE,IAAI,CAAC,gBAAgB,IAAI,CAAC,oBAAoB;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO;QACL,YAAY;QACZ,UAAU,EAAE,gBAAgB;QAC5B,cAAc,EAAE,oBAAoB;KACrC,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,OAAuB;IACtC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC3C,CAAC;AAMD,SAAgB,yBAAyB,CACvC,YAA4C,EAC5C,IAAsB;IAEtB,IAAI,CAAC,YAAY;QAAE,OAAO,OAAO,CAAC,IAAA,iBAAM,EAAC,6BAA6B,CAAC,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAChD,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CACtC,CAAC;IACF,IAAI,IAAI;QAAE,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,OAAO,CAAC,IAAA,iBAAM,EAAC,6BAA6B,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,IAAA,2BAAkB,GAAE;QACvB,OAAO,OAAO,CAAC,IAAA,sBAAW,EAAC,uBAAuB,CAAC,CAAC,CAAC;IACvD,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -4,7 +4,6 @@ export declare const provisioningAttemptsTableName = "saas_provisioning_attempts
|
|
|
4
4
|
export declare class ProvisioningAttempt extends Table {
|
|
5
5
|
_id: string;
|
|
6
6
|
revision: string;
|
|
7
|
-
capacityId: string | null;
|
|
8
7
|
planId: string;
|
|
9
8
|
userId: string;
|
|
10
9
|
state: ProvisioningAttemptState;
|
|
@@ -24,10 +24,6 @@ __decorate([
|
|
|
24
24
|
(0, interface_database_decorators_1.Field)("string"),
|
|
25
25
|
__metadata("design:type", String)
|
|
26
26
|
], ProvisioningAttempt.prototype, "revision", void 0);
|
|
27
|
-
__decorate([
|
|
28
|
-
(0, interface_database_decorators_1.Field)("string"),
|
|
29
|
-
__metadata("design:type", Object)
|
|
30
|
-
], ProvisioningAttempt.prototype, "capacityId", void 0);
|
|
31
27
|
__decorate([
|
|
32
28
|
(0, interface_database_decorators_1.Field)("string"),
|
|
33
29
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning-attempt.table.js","sourceRoot":"","sources":["../../../src/workspaces/db/provisioning-attempt.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAuE;AAQ1D,QAAA,6BAA6B,GAAG,4BAA4B,CAAC;AAInE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"provisioning-attempt.table.js","sourceRoot":"","sources":["../../../src/workspaces/db/provisioning-attempt.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAuE;AAQ1D,QAAA,6BAA6B,GAAG,4BAA4B,CAAC;AAInE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,qCAAK;CAuC7C,CAAA;AAvCY,kDAAmB;AAEtB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gDACI;AAGZ;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;qDACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACO;AAGf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACO;AAIf;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;kDACwB;AAGhC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6DACwB;AAGhC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iEAC4B;AAGpC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+DAC0B;AAGlC;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;6DACsB;AAG3B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sDACiB;AAIzB;IAFP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;sDAAC;AAIhB;IAFP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;sDAAC;8BAtCb,mBAAmB;IAD/B,IAAA,6CAAa,EAAC,qCAA6B,EAAE,4BAAgB,CAAC;GAClD,mBAAmB,CAuC/B"}
|
|
@@ -11,14 +11,14 @@ const tenant_lifecycle_1 = require("@antelopejs/interface-dms/tenant-lifecycle")
|
|
|
11
11
|
const billing_state_1 = require("../billing-state");
|
|
12
12
|
const config_1 = require("../config");
|
|
13
13
|
const db_2 = require("../db");
|
|
14
|
-
const
|
|
14
|
+
const free_plan_1 = require("./free-plan");
|
|
15
15
|
const LOG_PREFIX = "[dms-saas:default-plan]";
|
|
16
16
|
const ACTIVE_STATUS = "active";
|
|
17
17
|
const DEFAULT_PLAN_AUDIENCES = new Set(["any", "individual"]);
|
|
18
18
|
function isDefaultPlanCandidate(plan) {
|
|
19
19
|
return (plan.isActive &&
|
|
20
20
|
!plan.isDeleted &&
|
|
21
|
-
(0,
|
|
21
|
+
(0, free_plan_1.isFreePlan)(plan) &&
|
|
22
22
|
DEFAULT_PLAN_AUDIENCES.has(plan.audience));
|
|
23
23
|
}
|
|
24
24
|
function selectDefaultPlan(plans, configuredSlug) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-plan.js","sourceRoot":"","sources":["../../src/workspaces/default-plan.ts"],"names":[],"mappings":";;AAsCA,8CAeC;AAOD,gDAKC;AA6CD,8DAcC;AAmBD,oEAmBC;AAlKD,gEAA6D;AAC7D,6FAAqE;AACrE,qDAA2D;AAC3D,iFAAyF;AACzF,oDAA+D;AAC/D,sCAA+C;AAC/C,8BAKe;AACf,
|
|
1
|
+
{"version":3,"file":"default-plan.js","sourceRoot":"","sources":["../../src/workspaces/default-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"free-plan.js","sourceRoot":"","sources":["../../src/workspaces/free-plan.ts"],"names":[],"mappings":";;AAIA,gCAEC;AAJD,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,SAAgB,UAAU,CAAC,IAAU;IACnC,OAAO,IAAI,CAAC,KAAK,IAAI,eAAe,CAAC;AACvC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export * from "./billing-profile";
|
|
2
2
|
export * from "./default-plan";
|
|
3
3
|
export * from "./deletion";
|
|
4
|
-
export * from "./free-
|
|
4
|
+
export * from "./free-plan";
|
|
5
5
|
export * from "./invitations";
|
|
6
6
|
export * from "./provisioning";
|
|
7
7
|
export * from "./registration-extras";
|
package/dist/workspaces/index.js
CHANGED
|
@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./billing-profile"), exports);
|
|
18
18
|
__exportStar(require("./default-plan"), exports);
|
|
19
19
|
__exportStar(require("./deletion"), exports);
|
|
20
|
-
__exportStar(require("./free-
|
|
20
|
+
__exportStar(require("./free-plan"), exports);
|
|
21
21
|
__exportStar(require("./invitations"), exports);
|
|
22
22
|
__exportStar(require("./provisioning"), exports);
|
|
23
23
|
__exportStar(require("./registration-extras"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/workspaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,iDAA+B;AAC/B,6CAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/workspaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,iDAA+B;AAC/B,6CAA2B;AAC3B,8CAA4B;AAC5B,gDAA8B;AAC9B,iDAA+B;AAC/B,wDAAsC;AACtC,+CAA6B"}
|
|
@@ -4,23 +4,16 @@ exports.beginProvisioningAttempt = beginProvisioningAttempt;
|
|
|
4
4
|
exports.recordProvisioningState = recordProvisioningState;
|
|
5
5
|
exports.reserveTrialIdentities = reserveTrialIdentities;
|
|
6
6
|
const node_crypto_1 = require("node:crypto");
|
|
7
|
-
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
8
7
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
9
|
-
const card_capacity_model_1 = require("./db/card-capacity.model");
|
|
10
8
|
const provisioning_attempt_model_1 = require("./db/provisioning-attempt.model");
|
|
11
9
|
const trial_identity_model_1 = require("./db/trial-identity.model");
|
|
12
|
-
const free_workspace_guard_1 = require("./free-workspace-guard");
|
|
13
|
-
const HTTP_CONFLICT = 409;
|
|
14
10
|
async function beginProvisioningAttempt(input, plan) {
|
|
15
11
|
const tenantId = (0, node_crypto_1.randomUUID)();
|
|
16
|
-
const fingerprint = input.card.fingerprint;
|
|
17
|
-
const capacityId = fingerprint && (0, free_workspace_guard_1.isFreePlan)(plan) ? (0, card_capacity_model_1.cardCapacityId)(fingerprint) : null;
|
|
18
12
|
input.handles.tenantId = tenantId;
|
|
19
13
|
input.handles.mustPreserveWorkspace = true;
|
|
20
14
|
await (0, interface_database_decorators_1.GetModel)(provisioning_attempt_model_1.ProvisioningAttemptModel).insert({
|
|
21
15
|
_id: tenantId,
|
|
22
16
|
revision: (0, node_crypto_1.randomUUID)(),
|
|
23
|
-
capacityId,
|
|
24
17
|
planId: plan._id,
|
|
25
18
|
userId: input.userId,
|
|
26
19
|
state: "preparing",
|
|
@@ -30,14 +23,6 @@ async function beginProvisioningAttempt(input, plan) {
|
|
|
30
23
|
trialIdentityIds: [],
|
|
31
24
|
lastError: null,
|
|
32
25
|
});
|
|
33
|
-
if (capacityId && fingerprint) {
|
|
34
|
-
const admitted = await (0, interface_database_decorators_1.GetModel)(card_capacity_model_1.CardCapacityModel).reserve(capacityId, tenantId, await (0, free_workspace_guard_1.resolveMaxFreeWorkspacesPerCard)(), () => (0, free_workspace_guard_1.findFreeWorkspaceIdsBackedByCard)(fingerprint));
|
|
35
|
-
if (!admitted) {
|
|
36
|
-
await recordProvisioningState(input.handles, "cancelled");
|
|
37
|
-
input.handles.mustPreserveWorkspace = false;
|
|
38
|
-
}
|
|
39
|
-
(0, interface_api_util_1.assert)(admitted, HTTP_CONFLICT, "saas.errors.workspace.free_limit_reached");
|
|
40
|
-
}
|
|
41
26
|
input.handles.mustPreserveWorkspace = false;
|
|
42
27
|
}
|
|
43
28
|
async function recordProvisioningState(handles, state = "preparing") {
|
|
@@ -54,11 +39,7 @@ async function recordProvisioningState(handles, state = "preparing") {
|
|
|
54
39
|
trialConsumptionId: handles.trialConsumptionId ?? null,
|
|
55
40
|
trialIdentityIds: handles.trialIdentityIds ?? [],
|
|
56
41
|
});
|
|
57
|
-
if (state === "committed" && current.capacityId)
|
|
58
|
-
await (0, interface_database_decorators_1.GetModel)(card_capacity_model_1.CardCapacityModel).confirm(current.capacityId, current._id);
|
|
59
42
|
if (state === "cancelled") {
|
|
60
|
-
if (current.capacityId)
|
|
61
|
-
await (0, interface_database_decorators_1.GetModel)(card_capacity_model_1.CardCapacityModel).releaseCancelled(current.capacityId, current._id);
|
|
62
43
|
for (const id of current.trialIdentityIds)
|
|
63
44
|
await (0, interface_database_decorators_1.GetModel)(trial_identity_model_1.TrialIdentityModel).releaseUnused(id, current._id);
|
|
64
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning-state.js","sourceRoot":"","sources":["../../src/workspaces/provisioning-state.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"provisioning-state.js","sourceRoot":"","sources":["../../src/workspaces/provisioning-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const stripe_sync_1 = require("../plans/stripe-sync");
|
|
|
20
20
|
const stripe_1 = require("../stripe");
|
|
21
21
|
const utils_1 = require("../utils");
|
|
22
22
|
const default_plan_1 = require("./default-plan");
|
|
23
|
-
const
|
|
23
|
+
const free_plan_1 = require("./free-plan");
|
|
24
24
|
const subscription_create_params_1 = require("./subscription-create-params");
|
|
25
25
|
const provisioning_state_1 = require("./provisioning-state");
|
|
26
26
|
var provisioning_rollback_1 = require("./provisioning-rollback");
|
|
@@ -231,7 +231,7 @@ async function createOwnedTenant(workspaceName, userId, handles) {
|
|
|
231
231
|
async function provisionWorkspace(input) {
|
|
232
232
|
const plan = await (0, stripe_sync_1.loadBillablePlan)(input.payload.planId);
|
|
233
233
|
(0, interface_api_util_1.assert)(plan, HTTP_NOT_FOUND, "saas.errors.plan.not_available");
|
|
234
|
-
(0, interface_api_util_1.assert)(input.payload.paymentMethodId || (0,
|
|
234
|
+
(0, interface_api_util_1.assert)(input.payload.paymentMethodId || (0, free_plan_1.isFreePlan)(plan), HTTP_BAD_REQUEST, "saas.errors.workspace.payment_method_required");
|
|
235
235
|
await (0, provisioning_state_1.beginProvisioningAttempt)(input, plan);
|
|
236
236
|
try {
|
|
237
237
|
const provisioned = await runProvisioning(input);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning.js","sourceRoot":"","sources":["../../src/workspaces/provisioning.ts"],"names":[],"mappings":";;;AAsJA,oDAQC;AAED,4EAgBC;AAwBD,gDAoBC;AASD,0DAIC;AAiQD,gDAwBC;AAlgBD,uEAAwD;AACxD,6FAAqE;AACrE,qDAA2D;AAC3D,iFAAkF;AAClF,iFAAyF;AACzF,0DAA8D;AAC9D,oDAA+D;AAO/D,8BAKe;AACf,sEAA0E;AAC1E,2EAK8C;AAC9C,sDAAwD;AACxD,sCAOmB;AACnB,oCAA8E;AAC9E,iDAAoD;AACpD,iEAAoD;AACpD,6EAA6E;AAC7E,6DAI8B;AAC9B,iEAAwE;AAA/D,sIAAA,6BAA6B,OAAA;AAEtC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,aAAa,GAA6B,QAAQ,CAAC;AACzD,MAAM,eAAe,GAA6B,UAAU,CAAC;AAoG7D,SAAgB,oBAAoB,CAClC,OAA0C;IAE1C,IAAA,2BAAM,EACJ,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAChB,sCAAsC,CACvC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,gCAAgC,CACpD,MAAc,EACd,YAAmC;IAEnC,MAAM,IAAI,GAAG,MAAM,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnD,IAAA,2BAAM,EACJ,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EACxC,cAAc,EACd,gCAAgC,CACjC,CAAC;IACF,IAAA,2BAAM,EACJ,IAAI,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,EACzD,gBAAgB,EAChB,kDAAkD,CACnD,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,OAAO,GAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;AAM9E,MAAM,gBAAgB,GAAuB;IAC3C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EAAE;QACZ,oBAAoB,EAAE,IAAI;QAC1B,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,KAAK;QACjB,gBAAgB,EAAE,IAAI;QACtB,eAAe,EAAE,IAAI;KACtB;CACF,CAAC;AAOK,KAAK,UAAU,kBAAkB,CACtC,eAAmC;IAEnC,IAAI,CAAC,eAAe;QAAE,OAAO,OAAO,CAAC;IACrC,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,aAAa,CAAC,eAAe,EAAE,OAAO,CAAC;IACvD,OAAO;QACL,WAAW,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,IAAI,IAAI;QACpD,cAAc,EAAE,OAAO;YACrB,CAAC,CAAC;gBACE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;gBACjC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;gBACjC,UAAU,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS;gBAC5C,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;gBAC/B,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;gBACjC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;aACtC;YACH,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AASM,KAAK,UAAU,uBAAuB;IAC3C,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAkB,GAAE,CAAC;IAC5C,IAAA,2BAAM,EAAC,QAAQ,EAAE,aAAa,EAAE,+BAA+B,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,OAA8B,EAC9B,eAAuB,EACvB,OAAqC;IAErC,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IAGjC,MAAM,QAAQ,GAA2B;QACvC,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC;IACF,IAAI,OAAO,CAAC,SAAS;QAAE,QAAQ,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IAC9D,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACrC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAC5C;QACE,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EACF,OAAO,CAAC,YAAY,KAAK,UAAU;YACjC,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,OAAO,CAAC,YAAY;QAC1B,OAAO,EAAE,IAAA,wBAAe,EAAC,OAAO,CAAC,OAAO,CAAC;QACzC,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,mBAAmB,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE;KACvE,EACD,EAAE,cAAc,EAAE,yBAAyB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAChE,CAAC;IAIF,OAAO,CAAC,gBAAgB,GAAG,QAAQ,CAAC,EAAE,CAAC;IACvC,MAAM,IAAA,4CAAuB,EAAC,OAAO,CAAC,CAAC;IACvC,MAAM,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,EAAE;QAClD,QAAQ,EAAE,QAAQ,CAAC,EAAE;KACtB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;QACzC,gBAAgB,EAAE,EAAE,sBAAsB,EAAE,eAAe,EAAE;KAC9D,CAAC,CAAC;IACH,MAAM,IAAA,6BAAoB,EAAC,QAAQ,CAAC,EAAE,EAAE;QACtC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC;IACtC,OAAO,QAAQ,CAAC,EAAE,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,SAAiB,EACjB,SAAiB,EACjB,eAA8B,EAC9B,OAAqC;IAErC,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,MAAM,eAAe,GAAG,MAAM,IAAA,wCAAQ,EACpC,0BAAqB,CACtB,CAAC,iBAAiB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAChD,OAAO,CACL,CAAC,eAAe;QAChB,IAAA,2CAAsB,EAAC,OAAO,EAAE,SAAS,EAAE,eAAe,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,MAAc,EACd,SAAiB,EACjB,eAA8B,EAC9B,MAAc;IAEd,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAQ,EAAC,0BAAqB,CAAC,CAAC,MAAM,CAAC;QAC5D;YACE,MAAM;YACN,SAAS;YACT,kBAAkB,EAAE,eAAe;YACnC,MAAM;YACN,UAAU,EAAE,IAAI,IAAI,EAAE;SACvB;KACF,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAgC;IAEhC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,IAAA,2BAAM,EACJ,IAAI,CAAC,mBAAmB,EAAE,aAAa,EACvC,gBAAgB,EAChB,yCAAyC,CAC1C,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,IAAI,CAAC,SAAS,EACd,SAAS,EACT,KAAK,CAAC,eAAe,EACrB,OAAO,CACR,CAAC;IACF,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,IAAA,wBAAe,GAAE,CAAC,aAAa,CAAC,MAAM,CAC/D,IAAA,0DAA6B,EAC3B,KAAK,CAAC,gBAAgB,EACtB,IAAI,CAAC,mBAAmB,CAAC,aAAa,EACtC,IAAI,EACJ,UAAU,CACX,EACD,EAAE,cAAc,EAAE,6BAA6B,OAAO,CAAC,QAAQ,EAAE,EAAE,CACpE,CAAC;IACF,OAAO,CAAC,oBAAoB,GAAG,YAAY,CAAC,EAAE,CAAC;IAC/C,MAAM,IAAA,4CAAuB,EAAC,OAAO,CAAC,CAAC;IACvC,IAAI,UAAU,EAAE,CAAC;QAIf,OAAO,CAAC,kBAAkB,GAAG,MAAM,sBAAsB,CACvD,KAAK,CAAC,MAAM,EACZ,SAAS,EACT,KAAK,CAAC,eAAe,EACrB,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,IAAA,4CAAuB,EAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC;IACtC,OAAO;QACL,oBAAoB,EAAE,YAAY,CAAC,EAAE;QACrC,SAAS,EAAE,IAAA,2BAAmB,EAAC,YAAY,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE;QACrE,UAAU,EAAE,UAAU;QACtB,gBAAgB,EAAE,IAAA,kCAAyB,EAAC,YAAY,CAAC;QACzD,eAAe,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC,cAAc,CAAC;KAC3D,CAAC;AACJ,CAAC;AAUD,KAAK,UAAU,yBAAyB,CACtC,YAAiC,EACjC,QAAgB,EAChB,OAAqC;IAErC,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU;QACvC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC;IACjC,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACrC,MAAM,IAAA,4CAAuB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC3D,MAAM,IAAA,0CAAuB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACnD,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,GAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO;QACtC,MAAM,IAAA,wBAAe,GAAE,CAAC,QAAQ,CAAC,GAAG,CAClC,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,EACrB;YACE,cAAc,EAAE,qBAAqB,QAAQ,EAAE;SAChD,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEf,IACE,KAAK,YAAY,KAAK;YACtB,MAAM,IAAI,KAAK;YACf,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAChC,CAAC;YACD,MAAM,IAAA,yCAAsB,EAAC,QAAQ,CAAC,CAAC;YACvC,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACxC,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAMD,SAAS,uBAAuB,CAC9B,YAAiC;IAEjC,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC;IACzD,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IACnD,OAAO,CAAC,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,CAAC;AAQD,KAAK,UAAU,mBAAmB,CAAC,KAAyB;IAC1D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAClD,MAAM,iBAAiB,GAAG;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa;QACjE,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,uBAAuB,CAAC,YAAY,CAAC;QACvD,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,oBAAoB,EAAE,YAAY,CAAC,oBAAoB;QACvD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,SAAS,EAAE,KAAK,CAAC,MAAM;QACvB,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC;IACF,MAAM,IAAA,0BAAkB,EACtB,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,EAC3C,QAAQ,EACR,EAAE,GAAG,iBAAiB,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAC9D,iBAAiB,CAClB,CAAC;IACF,MAAM,WAAW,GAAG;QAClB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;QACxC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;QACpC,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,OAAO,EAAE,IAAA,+BAAsB,EAAC,OAAO,CAAC,OAAO,CAAC;QAChD,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC;IACF,MAAM,IAAA,0BAAkB,EACtB,IAAA,wCAAQ,EAAC,2BAAsB,EAAE,QAAQ,CAAC,EAC1C,QAAQ,EACR,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,EACjC,WAAW,CACZ,CAAC;IACF,MAAM,IAAA,2CAA2B,EAAC,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,aAAqB,EACrB,MAAc,EACd,OAAqC;IAErC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,OAAO,IAAA,8CAA2B,EAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,IAAA,yCAAsB,EAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,IAAA,wCAAQ,EAAC,gBAAW,CAAC,CAAC,MAAM,CAAC;YACjC;gBACE,GAAG,EAAE,QAAQ;gBACb,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB;SACF,CAAC,CAAC;QACH,MAAM,IAAA,uCAAoB,EAAC,IAAA,wCAAQ,EAAC,cAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;YAChE,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAGM,KAAK,UAAU,kBAAkB,CACtC,KAAiC;IAEjC,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAgB,EAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,IAAA,2BAAM,EAAC,IAAI,EAAE,cAAc,EAAE,gCAAgC,CAAC,CAAC;IAG/D,IAAA,2BAAM,EACJ,KAAK,CAAC,OAAO,CAAC,eAAe,IAAI,IAAA,iCAAU,EAAC,IAAI,CAAC,EACjD,gBAAgB,EAChB,+CAA+C,CAChD,CAAC;IACF,MAAM,IAAA,6CAAwB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,IAAA,4CAAuB,EAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1D,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,4CAAuB,EAC3B,KAAK,CAAC,OAAO,EACb,yBAAyB,CAC1B,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAClB,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,KAAiC,EACjC,IAAU,EACV,eAAuB;IAEvB,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACjD,MAAM,gBAAgB,GAAG,MAAM,oBAAoB,CACjD,qBAAqB,EACrB,eAAe,EACf,OAAO,CACR,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC;QAC5C,gBAAgB;QAChB,IAAI;QACJ,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,qBAAqB,CAAC,KAAK;QAClC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW;QACvC,OAAO;KACR,CAAC,CAAC;IACH,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,KAAiC;IAEjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxE,MAAM,IAAI,GAAG,MAAM,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,IAAA,2BAAM,EAAC,IAAI,EAAE,cAAc,EAAE,gCAAgC,CAAC,CAAC;IAC/D,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe;QAChE,CAAC,CAAC,MAAM,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC;QACpE,CAAC,CAAC,gBAAgB,CAAC;IAErB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CACtC,OAAO,CAAC,aAAa,EACrB,MAAM,EACN,OAAO,CACR,CAAC;IACF,MAAM,IAAA,8CAA2B,EAAC,QAAQ,EAAE,GAAG,EAAE,CAC/C,mBAAmB,CAAC;QAClB,QAAQ;QACR,MAAM;QACN,OAAO;QACP,gBAAgB;QAChB,eAAe,EAAE,IAAI,CAAC,WAAW;QACjC,YAAY;QACZ,YAAY,EAAE,qBAAqB,CAAC,KAAK;KAC1C,CAAC,CACH,CAAC;IAQF,MAAM,IAAA,gDAA0B,EAAC;QAC/B,QAAQ;QACR,MAAM;QACN,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,MAAM,yBAAyB,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,IAAA,0CAAuB,EAAC,QAAQ,CAAC,CAAC;IAExC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE,CAAC;AAC3D,CAAC"}
|
|
1
|
+
{"version":3,"file":"provisioning.js","sourceRoot":"","sources":["../../src/workspaces/provisioning.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,16 @@ const FREE_PLAN_PRICE = 0;
|
|
|
13
13
|
const EXPIRY_YEAR_MODULO = 100;
|
|
14
14
|
const EXPIRY_PAD_LENGTH = 2;
|
|
15
15
|
const KEY_PREFIX = "saas.workspace.billing.payment_method";
|
|
16
|
+
const FULL_DATE_FORMAT: Intl.DateTimeFormatOptions = {
|
|
17
|
+
year: "numeric",
|
|
18
|
+
month: "long",
|
|
19
|
+
day: "numeric",
|
|
20
|
+
};
|
|
16
21
|
|
|
17
22
|
const { data, error, load, refresh } = useBillingStatus();
|
|
18
23
|
const { data: plan, load: loadPlan } = useTenantPlan();
|
|
19
24
|
const { open: openPlanComparison } = usePlanComparison();
|
|
25
|
+
const { t, locale } = useI18n();
|
|
20
26
|
|
|
21
27
|
const card = computed(() => data.value?.paymentMethod ?? null);
|
|
22
28
|
const needsUpdate = computed(() => data.value?.status === PAST_DUE_STATUS);
|
|
@@ -27,6 +33,21 @@ const isFreePlan = computed(
|
|
|
27
33
|
// manages the card rather than shown a misleading "no card".
|
|
28
34
|
const isTenantOwner = computed(() => !!data.value?.isTenantOwner);
|
|
29
35
|
const hasStripeCustomer = computed(() => !!data.value?.hasStripeCustomer);
|
|
36
|
+
// A gift on the top plan needs no card: offering an upgrade there is noise.
|
|
37
|
+
const complimentaryAccess = computed(() =>
|
|
38
|
+
resolveComplimentaryAccess(plan.value),
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
const complimentaryNote = computed(() => {
|
|
42
|
+
const endsOn = formatDate(
|
|
43
|
+
complimentaryAccess.value?.endsAt,
|
|
44
|
+
locale.value,
|
|
45
|
+
FULL_DATE_FORMAT,
|
|
46
|
+
);
|
|
47
|
+
return endsOn
|
|
48
|
+
? t(`${KEY_PREFIX}.complimentary_until_note`, { date: endsOn })
|
|
49
|
+
: t(`${KEY_PREFIX}.complimentary_note`);
|
|
50
|
+
});
|
|
30
51
|
|
|
31
52
|
// "You'll be asked for a card on upgrade" is only true without a Stripe
|
|
32
53
|
// customer: once one exists, a missing card is added through the portal.
|
|
@@ -35,6 +56,9 @@ const noCardKey = computed(() =>
|
|
|
35
56
|
);
|
|
36
57
|
|
|
37
58
|
const headerBadge = computed<PaymentMethodBadge>(() => {
|
|
59
|
+
if (complimentaryAccess.value) {
|
|
60
|
+
return { color: "success", key: "complimentary" };
|
|
61
|
+
}
|
|
38
62
|
if (!card.value) return { color: "warning", key: "missing" };
|
|
39
63
|
if (needsUpdate.value) return { color: "warning", key: "needs_update" };
|
|
40
64
|
if (isFreePlan.value) return { color: "success", key: "verified" };
|
|
@@ -84,7 +108,15 @@ onMounted(() => {
|
|
|
84
108
|
</p>
|
|
85
109
|
|
|
86
110
|
<div v-else class="flex flex-col gap-4">
|
|
87
|
-
<
|
|
111
|
+
<div
|
|
112
|
+
v-if="complimentaryAccess"
|
|
113
|
+
class="border-default flex flex-wrap items-center gap-3 rounded-lg border border-dashed p-3"
|
|
114
|
+
>
|
|
115
|
+
<UIcon name="i-ph-gift" class="text-muted size-5" />
|
|
116
|
+
<span class="text-muted grow text-sm">{{ complimentaryNote }}</span>
|
|
117
|
+
</div>
|
|
118
|
+
|
|
119
|
+
<template v-else-if="card">
|
|
88
120
|
<div
|
|
89
121
|
class="border-default flex flex-wrap items-center gap-3 rounded-lg border p-3"
|
|
90
122
|
>
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import { computed, onMounted, ref } from "vue";
|
|
2
|
+
import { computed, nextTick, onMounted, ref, watch } from "vue";
|
|
3
|
+
|
|
4
|
+
interface ConfirmedPayment {
|
|
5
|
+
isConfirmed: boolean;
|
|
6
|
+
paymentMethodId?: string;
|
|
7
|
+
}
|
|
3
8
|
|
|
4
9
|
interface PlanOption {
|
|
5
10
|
_id: string;
|
|
@@ -10,15 +15,6 @@ interface PlanOption {
|
|
|
10
15
|
interval: "month" | "year";
|
|
11
16
|
}
|
|
12
17
|
|
|
13
|
-
interface FreePlanAvailability {
|
|
14
|
-
isAvailable: boolean;
|
|
15
|
-
blockingWorkspaceName: string | null;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
interface CreateOptions {
|
|
19
|
-
freePlan: FreePlanAvailability;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
18
|
const props = defineProps<{
|
|
23
19
|
onSuccessCallback?: (tenantId: string) => void;
|
|
24
20
|
onCancelCallback?: () => void;
|
|
@@ -48,10 +44,6 @@ const stripePublishableKey = computed<string>(
|
|
|
48
44
|
const workspaceName = ref("");
|
|
49
45
|
const plans = ref<PlanOption[]>([]);
|
|
50
46
|
const selectedPlanId = ref<string | null>(null);
|
|
51
|
-
const freePlan = ref<FreePlanAvailability>({
|
|
52
|
-
isAvailable: true,
|
|
53
|
-
blockingWorkspaceName: null,
|
|
54
|
-
});
|
|
55
47
|
const isLoading = ref(true);
|
|
56
48
|
const isSubmitting = ref(false);
|
|
57
49
|
const errorMessage = ref<string | null>(null);
|
|
@@ -65,10 +57,6 @@ function isFreePlan(plan: PlanOption): boolean {
|
|
|
65
57
|
return plan.price <= FREE_PLAN_PRICE;
|
|
66
58
|
}
|
|
67
59
|
|
|
68
|
-
function isPlanDisabled(plan: PlanOption): boolean {
|
|
69
|
-
return isFreePlan(plan) && !freePlan.value.isAvailable;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
60
|
function formatPrice(plan: PlanOption): string {
|
|
73
61
|
return new Intl.NumberFormat(locale.value, {
|
|
74
62
|
style: "currency",
|
|
@@ -85,17 +73,13 @@ function planPriceLabel(plan: PlanOption): string {
|
|
|
85
73
|
});
|
|
86
74
|
}
|
|
87
75
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
if (!workspace) {
|
|
92
|
-
return t("saas.workspaces.create.self_serve.free_unavailable");
|
|
93
|
-
}
|
|
94
|
-
return t("saas.workspaces.create.self_serve.free_taken", { workspace });
|
|
95
|
-
}
|
|
76
|
+
const selectedPlan = computed(
|
|
77
|
+
() => plans.value.find((plan) => plan._id === selectedPlanId.value) ?? null,
|
|
78
|
+
);
|
|
96
79
|
|
|
97
|
-
|
|
98
|
-
|
|
80
|
+
// A free plan bills nothing, so it never asks for a card.
|
|
81
|
+
const requiresCard = computed(
|
|
82
|
+
() => !!selectedPlan.value && !isFreePlan(selectedPlan.value),
|
|
99
83
|
);
|
|
100
84
|
|
|
101
85
|
// Only once the catalogue actually loaded: a failed load reports itself.
|
|
@@ -104,7 +88,6 @@ const hasNoPlanOnOffer = computed(
|
|
|
104
88
|
);
|
|
105
89
|
|
|
106
90
|
function selectPlan(plan: PlanOption): void {
|
|
107
|
-
if (isPlanDisabled(plan)) return;
|
|
108
91
|
selectedPlanId.value = plan._id;
|
|
109
92
|
}
|
|
110
93
|
|
|
@@ -126,17 +109,39 @@ async function initStripeElement(): Promise<void> {
|
|
|
126
109
|
});
|
|
127
110
|
}
|
|
128
111
|
|
|
112
|
+
let cardSetup: Promise<void> | null = null;
|
|
113
|
+
|
|
114
|
+
// Set up once, on the first paid plan picked, then only hidden: switching back
|
|
115
|
+
// and forth between plans keeps the card already typed in.
|
|
116
|
+
async function setUpCard(): Promise<void> {
|
|
117
|
+
// The card container only exists once the form has rendered.
|
|
118
|
+
await nextTick();
|
|
119
|
+
try {
|
|
120
|
+
await initStripeElement();
|
|
121
|
+
} catch (error) {
|
|
122
|
+
cardError.value = resolveApiError(
|
|
123
|
+
error,
|
|
124
|
+
"saas.workspaces.create.self_serve.error.card",
|
|
125
|
+
);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function ensureCardStep(): Promise<void> {
|
|
130
|
+
if (!requiresCard.value) return Promise.resolve();
|
|
131
|
+
cardSetup ??= setUpCard();
|
|
132
|
+
return cardSetup;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
watch(requiresCard, ensureCardStep);
|
|
136
|
+
|
|
129
137
|
async function load(): Promise<void> {
|
|
130
138
|
try {
|
|
131
|
-
const [loadedPlans
|
|
139
|
+
const [loadedPlans] = await Promise.all([
|
|
132
140
|
$authFetch<PlanOption[]>(PLANS_ENDPOINT),
|
|
133
|
-
$authFetch
|
|
141
|
+
$authFetch(OPTIONS_ENDPOINT),
|
|
134
142
|
]);
|
|
135
143
|
plans.value = loadedPlans;
|
|
136
|
-
|
|
137
|
-
selectedPlanId.value = selectablePlans.value[0]?._id ?? null;
|
|
138
|
-
// Nothing to pay for, so no card to set up.
|
|
139
|
-
if (loadedPlans.length === 0) return;
|
|
144
|
+
selectedPlanId.value = loadedPlans[0]?._id ?? null;
|
|
140
145
|
} catch (error) {
|
|
141
146
|
errorMessage.value = resolveApiError(
|
|
142
147
|
error,
|
|
@@ -148,14 +153,7 @@ async function load(): Promise<void> {
|
|
|
148
153
|
}
|
|
149
154
|
// Kept out of the block above so a card-setup outage reports itself as such
|
|
150
155
|
// instead of hiding behind "could not load the creation options".
|
|
151
|
-
|
|
152
|
-
await initStripeElement();
|
|
153
|
-
} catch (error) {
|
|
154
|
-
cardError.value = resolveApiError(
|
|
155
|
-
error,
|
|
156
|
-
"saas.workspaces.create.self_serve.error.card",
|
|
157
|
-
);
|
|
158
|
-
}
|
|
156
|
+
await ensureCardStep();
|
|
159
157
|
}
|
|
160
158
|
|
|
161
159
|
function validate(): boolean {
|
|
@@ -167,30 +165,37 @@ function validate(): boolean {
|
|
|
167
165
|
errorMessage.value = t("saas.workspaces.create.error.plan");
|
|
168
166
|
return false;
|
|
169
167
|
}
|
|
170
|
-
if (!stripeHandle.value) {
|
|
168
|
+
if (requiresCard.value && !stripeHandle.value) {
|
|
171
169
|
errorMessage.value = t("saas.register.error.no_payment");
|
|
172
170
|
return false;
|
|
173
171
|
}
|
|
174
172
|
return true;
|
|
175
173
|
}
|
|
176
174
|
|
|
175
|
+
async function confirmPaymentMethod(): Promise<ConfirmedPayment> {
|
|
176
|
+
if (!requiresCard.value) return { isConfirmed: true };
|
|
177
|
+
const confirmed = await stripeHandle.value?.confirmAndGetPaymentMethod();
|
|
178
|
+
if (confirmed?.paymentMethodId) {
|
|
179
|
+
return { isConfirmed: true, paymentMethodId: confirmed.paymentMethodId };
|
|
180
|
+
}
|
|
181
|
+
errorMessage.value =
|
|
182
|
+
confirmed?.error?.message ?? t("saas.register.error.no_payment");
|
|
183
|
+
return { isConfirmed: false };
|
|
184
|
+
}
|
|
185
|
+
|
|
177
186
|
async function submit(): Promise<void> {
|
|
178
187
|
if (isSubmitting.value || !validate()) return;
|
|
179
188
|
errorMessage.value = null;
|
|
180
189
|
isSubmitting.value = true;
|
|
181
190
|
try {
|
|
182
|
-
const
|
|
183
|
-
if (!
|
|
184
|
-
errorMessage.value =
|
|
185
|
-
confirmed?.error?.message ?? t("saas.register.error.no_payment");
|
|
186
|
-
return;
|
|
187
|
-
}
|
|
191
|
+
const payment = await confirmPaymentMethod();
|
|
192
|
+
if (!payment.isConfirmed) return;
|
|
188
193
|
const created = await $authFetch<{ tenantId: string }>(CREATE_ENDPOINT, {
|
|
189
194
|
method: "POST",
|
|
190
195
|
body: {
|
|
191
196
|
workspaceName: workspaceName.value.trim(),
|
|
192
197
|
planId: selectedPlanId.value,
|
|
193
|
-
paymentMethodId:
|
|
198
|
+
paymentMethodId: payment.paymentMethodId,
|
|
194
199
|
},
|
|
195
200
|
});
|
|
196
201
|
props.onSuccessCallback?.(created.tenantId);
|
|
@@ -245,26 +250,21 @@ onMounted(load);
|
|
|
245
250
|
v-for="plan in plans"
|
|
246
251
|
:key="plan._id"
|
|
247
252
|
type="button"
|
|
248
|
-
class="border-default flex flex-col gap-1 rounded-md border px-3 py-2.5 text-left transition-colors"
|
|
249
|
-
:class="
|
|
250
|
-
selectedPlanId === plan._id ? 'border-primary bg-primary/5' : '',
|
|
251
|
-
isPlanDisabled(plan)
|
|
252
|
-
? 'cursor-not-allowed opacity-60'
|
|
253
|
-
: 'hover:border-accented cursor-pointer',
|
|
254
|
-
]"
|
|
255
|
-
:disabled="isPlanDisabled(plan)"
|
|
253
|
+
class="border-default hover:border-accented flex cursor-pointer flex-col gap-1 rounded-md border px-3 py-2.5 text-left transition-colors"
|
|
254
|
+
:class="selectedPlanId === plan._id ? 'border-primary bg-primary/5' : ''"
|
|
256
255
|
:aria-pressed="selectedPlanId === plan._id"
|
|
257
256
|
@click="selectPlan(plan)"
|
|
258
257
|
>
|
|
259
258
|
<span class="text-highlighted text-sm font-medium">
|
|
260
259
|
{{ plan.name }} — {{ planPriceLabel(plan) }}
|
|
261
260
|
</span>
|
|
262
|
-
<span class="text-muted text-xs">{{
|
|
261
|
+
<span class="text-muted text-xs">{{ planDescription(plan.description) }}</span>
|
|
263
262
|
</button>
|
|
264
263
|
</div>
|
|
265
264
|
|
|
266
265
|
<UFormField
|
|
267
266
|
v-if="!hasNoPlanOnOffer"
|
|
267
|
+
v-show="requiresCard"
|
|
268
268
|
:label="$t('saas.workspaces.create.self_serve.card')"
|
|
269
269
|
>
|
|
270
270
|
<div :id="PAYMENT_ELEMENT_ID" class="border-default rounded-md border p-4" />
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { TenantPlanResponse } from "./useTenantPlan";
|
|
2
|
+
|
|
3
|
+
type ComplimentaryAccessState = Pick<
|
|
4
|
+
TenantPlanResponse,
|
|
5
|
+
"isPlanChangeLocked" | "freeUntil"
|
|
6
|
+
>;
|
|
7
|
+
|
|
8
|
+
/** A complimentary gift still in force, with its end date when it has one. */
|
|
9
|
+
export interface ComplimentaryAccess {
|
|
10
|
+
endsAt: string | null;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* `isPlanChangeLocked` is the server applying `isComplimentaryPlanLocked`:
|
|
15
|
+
* reading it instead of comparing `freeUntil` to the browser clock keeps the
|
|
16
|
+
* billing page aligned with what the plan endpoints actually allow.
|
|
17
|
+
*/
|
|
18
|
+
export function resolveComplimentaryAccess(
|
|
19
|
+
plan: ComplimentaryAccessState | null,
|
|
20
|
+
): ComplimentaryAccess | null {
|
|
21
|
+
if (!plan?.isPlanChangeLocked) return null;
|
|
22
|
+
return { endsAt: plan.freeUntil };
|
|
23
|
+
}
|
|
@@ -55,7 +55,6 @@
|
|
|
55
55
|
"access_blocked": "Access to this workspace is restricted by its subscription status",
|
|
56
56
|
"already_suspended": "Workspace is already suspended",
|
|
57
57
|
"not_suspended": "Workspace is not suspended",
|
|
58
|
-
"free_limit_reached": "This card has already reached the free workspace limit.",
|
|
59
58
|
"creation_in_progress": "Another workspace is already being created with this card. Please wait a moment and try again.",
|
|
60
59
|
"name_required": "The workspace name is required.",
|
|
61
60
|
"payment_method_required": "A card is required.",
|
|
@@ -575,8 +574,6 @@
|
|
|
575
574
|
},
|
|
576
575
|
"card": "Card",
|
|
577
576
|
"submit": "Create",
|
|
578
|
-
"free_taken": "Free workspace limit reached for this card — already used by “{workspace}”.",
|
|
579
|
-
"free_unavailable": "Free workspace limit reached for this card.",
|
|
580
577
|
"error": {
|
|
581
578
|
"load": "Could not load the creation options.",
|
|
582
579
|
"failed": "Could not create the workspace.",
|
|
@@ -903,9 +900,7 @@
|
|
|
903
900
|
"data_retention_days": "Data retention (days)",
|
|
904
901
|
"data_retention_days_desc": "How long cancelled workspace data is kept before hard delete.",
|
|
905
902
|
"stripe_tax_code": "Stripe tax code (product)",
|
|
906
|
-
"stripe_tax_code_desc": "Stripe tax category code applied to products on sync (e.g. txcd_10000000). Required for automatic VAT calculation. Re-sync plans to apply it."
|
|
907
|
-
"max_free_workspaces_per_card": "Free workspaces per card",
|
|
908
|
-
"max_free_workspaces_per_card_desc": "How many workspaces on a free plan a single card may back."
|
|
903
|
+
"stripe_tax_code_desc": "Stripe tax category code applied to products on sync (e.g. txcd_10000000). Required for automatic VAT calculation. Re-sync plans to apply it."
|
|
909
904
|
},
|
|
910
905
|
"refund": {
|
|
911
906
|
"money_back_guarantee": "Money-back guarantee",
|
|
@@ -1010,7 +1005,10 @@
|
|
|
1010
1005
|
"add": "Upgrade to a paid plan",
|
|
1011
1006
|
"owner_only": "The payment method is managed by the workspace owner.",
|
|
1012
1007
|
"update_note": "The last charge on this card was declined: update it in the Stripe portal, then settle the unpaid invoice.",
|
|
1013
|
-
"free_note": "Verified — never charged while the workspace stays on a free plan."
|
|
1008
|
+
"free_note": "Verified — never charged while the workspace stays on a free plan.",
|
|
1009
|
+
"complimentary": "complimentary",
|
|
1010
|
+
"complimentary_note": "Complimentary access: no card is needed.",
|
|
1011
|
+
"complimentary_until_note": "Complimentary access until {date}: no card is needed until then."
|
|
1014
1012
|
},
|
|
1015
1013
|
"billing_email": {
|
|
1016
1014
|
"label": "Billing e-mail",
|
|
@@ -55,7 +55,6 @@
|
|
|
55
55
|
"access_blocked": "L'accès à cet espace de travail est restreint par le statut de son abonnement",
|
|
56
56
|
"already_suspended": "Le workspace est déjà suspendu",
|
|
57
57
|
"not_suspended": "Le workspace n'est pas suspendu",
|
|
58
|
-
"free_limit_reached": "Cette carte a déjà atteint la limite de workspaces Free.",
|
|
59
58
|
"creation_in_progress": "Un autre workspace est déjà en cours de création avec cette carte. Patientez un instant puis réessayez.",
|
|
60
59
|
"name_required": "Le nom du workspace est obligatoire.",
|
|
61
60
|
"payment_method_required": "Une carte bancaire est requise.",
|
|
@@ -575,8 +574,6 @@
|
|
|
575
574
|
},
|
|
576
575
|
"card": "Carte bancaire",
|
|
577
576
|
"submit": "Créer",
|
|
578
|
-
"free_taken": "Limite de workspaces Free par carte atteinte — déjà utilisée par « {workspace} ».",
|
|
579
|
-
"free_unavailable": "Limite de workspaces Free par carte atteinte.",
|
|
580
577
|
"error": {
|
|
581
578
|
"load": "Impossible de charger les options de création.",
|
|
582
579
|
"failed": "Impossible de créer le workspace.",
|
|
@@ -903,9 +900,7 @@
|
|
|
903
900
|
"data_retention_days": "Rétention des données (jours)",
|
|
904
901
|
"data_retention_days_desc": "Durée de conservation des données d'un workspace annulé avant suppression définitive.",
|
|
905
902
|
"stripe_tax_code": "Code de taxe Stripe (produit)",
|
|
906
|
-
"stripe_tax_code_desc": "Code de catégorie fiscale Stripe appliqué aux produits lors de la synchronisation (ex. txcd_10000000). Requis pour le calcul automatique de la TVA. À appliquer en re-synchronisant les plans."
|
|
907
|
-
"max_free_workspaces_per_card": "Workspaces Free par carte",
|
|
908
|
-
"max_free_workspaces_per_card_desc": "Nombre de workspaces sur un plan gratuit qu'une même carte bancaire peut adosser."
|
|
903
|
+
"stripe_tax_code_desc": "Code de catégorie fiscale Stripe appliqué aux produits lors de la synchronisation (ex. txcd_10000000). Requis pour le calcul automatique de la TVA. À appliquer en re-synchronisant les plans."
|
|
909
904
|
},
|
|
910
905
|
"refund": {
|
|
911
906
|
"money_back_guarantee": "Garantie satisfait ou remboursé",
|
|
@@ -1010,7 +1005,10 @@
|
|
|
1010
1005
|
"add": "Passer à un plan payant",
|
|
1011
1006
|
"owner_only": "Le moyen de paiement est géré par le propriétaire du workspace.",
|
|
1012
1007
|
"update_note": "Le dernier prélèvement sur cette carte a été refusé : mettez-la à jour dans le portail Stripe, puis réglez la facture impayée.",
|
|
1013
|
-
"free_note": "Vérifiée — jamais débitée tant que le workspace reste sur un plan gratuit."
|
|
1008
|
+
"free_note": "Vérifiée — jamais débitée tant que le workspace reste sur un plan gratuit.",
|
|
1009
|
+
"complimentary": "offert",
|
|
1010
|
+
"complimentary_note": "Accès offert : aucune carte n'est nécessaire.",
|
|
1011
|
+
"complimentary_until_note": "Accès offert jusqu'au {date} : aucune carte n'est nécessaire d'ici là."
|
|
1014
1012
|
},
|
|
1015
1013
|
"billing_email": {
|
|
1016
1014
|
"label": "E-mail de facturation",
|
package/package.json
CHANGED
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { CardCapacity } from "./card-capacity.table";
|
|
2
|
-
type ReadFreeWorkspaceIds = () => Promise<string[]>;
|
|
3
|
-
export declare function cardCapacityId(fingerprint: string): string;
|
|
4
|
-
declare const CardCapacityModel_base: {
|
|
5
|
-
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
6
|
-
readonly table: import("@antelopejs/interface-database").Table<CardCapacity>;
|
|
7
|
-
readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
|
|
8
|
-
get(id: string): PromiseLike<CardCapacity | undefined>;
|
|
9
|
-
getBy(index: keyof CardCapacity, ...keys: any[]): PromiseLike<CardCapacity[]>;
|
|
10
|
-
getAll(): PromiseLike<CardCapacity[]>;
|
|
11
|
-
insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<CardCapacity> | import("@antelopejs/interface-database-decorators").DeepPartial<CardCapacity>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
|
|
12
|
-
update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<CardCapacity>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
|
|
13
|
-
update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<CardCapacity>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
|
|
14
|
-
delete(id: string): Promise<number>;
|
|
15
|
-
};
|
|
16
|
-
readonly schemaName: string;
|
|
17
|
-
fromPlainData(obj: any): CardCapacity;
|
|
18
|
-
fromDatabase(obj: any): CardCapacity | undefined;
|
|
19
|
-
toDatabase(obj: any): Record<string, any>;
|
|
20
|
-
validate(obj: unknown, options?: import("@antelopejs/interface-database-decorators").ValidateInputOptions): import("@antelopejs/interface-database-decorators").ValidationResult;
|
|
21
|
-
};
|
|
22
|
-
export declare class CardCapacityModel extends CardCapacityModel_base {
|
|
23
|
-
private getOrCreate;
|
|
24
|
-
private replaceAllocations;
|
|
25
|
-
reserve(id: string, tenantId: string, limit: number, readLiveIds: ReadFreeWorkspaceIds): Promise<boolean>;
|
|
26
|
-
confirm(id: string, tenantId: string): Promise<void>;
|
|
27
|
-
releaseCancelled(id: string, tenantId: string): Promise<void>;
|
|
28
|
-
private changeAllocation;
|
|
29
|
-
}
|
|
30
|
-
export {};
|
|
@@ -1,98 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CardCapacityModel = void 0;
|
|
4
|
-
exports.cardCapacityId = cardCapacityId;
|
|
5
|
-
const node_crypto_1 = require("node:crypto");
|
|
6
|
-
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
7
|
-
const card_capacity_table_1 = require("./card-capacity.table");
|
|
8
|
-
const MAX_ADMISSION_ATTEMPTS = 16;
|
|
9
|
-
function cardCapacityId(fingerprint) {
|
|
10
|
-
return (0, node_crypto_1.createHash)("sha256").update(fingerprint).digest("hex");
|
|
11
|
-
}
|
|
12
|
-
function currentAllocations(capacity, liveIds) {
|
|
13
|
-
const live = new Set(liveIds);
|
|
14
|
-
const allocations = capacity.allocations.filter((allocation) => allocation.state !== "confirmed" || live.has(allocation.tenantId));
|
|
15
|
-
const known = new Set(allocations.map((allocation) => allocation.tenantId));
|
|
16
|
-
return [
|
|
17
|
-
...allocations,
|
|
18
|
-
...liveIds
|
|
19
|
-
.filter((tenantId) => !known.has(tenantId))
|
|
20
|
-
.map((tenantId) => ({
|
|
21
|
-
tenantId,
|
|
22
|
-
state: "confirmed",
|
|
23
|
-
})),
|
|
24
|
-
];
|
|
25
|
-
}
|
|
26
|
-
class CardCapacityModel extends (0, interface_database_decorators_1.BasicDataModel)(card_capacity_table_1.CardCapacity, card_capacity_table_1.cardCapacitiesTableName) {
|
|
27
|
-
async getOrCreate(id) {
|
|
28
|
-
const existing = await this.get(id);
|
|
29
|
-
if (existing)
|
|
30
|
-
return existing;
|
|
31
|
-
try {
|
|
32
|
-
await this.insert({ _id: id, revision: (0, node_crypto_1.randomUUID)(), allocations: [] });
|
|
33
|
-
}
|
|
34
|
-
catch (error) {
|
|
35
|
-
const concurrent = await this.get(id);
|
|
36
|
-
if (concurrent)
|
|
37
|
-
return concurrent;
|
|
38
|
-
throw error;
|
|
39
|
-
}
|
|
40
|
-
const created = await this.get(id);
|
|
41
|
-
if (!created)
|
|
42
|
-
throw new Error("Card capacity was not persisted");
|
|
43
|
-
return created;
|
|
44
|
-
}
|
|
45
|
-
replaceAllocations(current, allocations) {
|
|
46
|
-
return this.table
|
|
47
|
-
.atomicMutation(current._id, {
|
|
48
|
-
type: "update",
|
|
49
|
-
revisionField: "revision",
|
|
50
|
-
expectedRevision: current.revision,
|
|
51
|
-
nextRevision: (0, node_crypto_1.randomUUID)(),
|
|
52
|
-
patch: { allocations },
|
|
53
|
-
})
|
|
54
|
-
.run();
|
|
55
|
-
}
|
|
56
|
-
async reserve(id, tenantId, limit, readLiveIds) {
|
|
57
|
-
for (let attempt = 0; attempt < MAX_ADMISSION_ATTEMPTS; attempt++) {
|
|
58
|
-
const current = await this.getOrCreate(id);
|
|
59
|
-
if (current.allocations.some((allocation) => allocation.tenantId === tenantId))
|
|
60
|
-
return true;
|
|
61
|
-
const allocations = currentAllocations(current, await readLiveIds());
|
|
62
|
-
if (allocations.length >= limit)
|
|
63
|
-
return false;
|
|
64
|
-
allocations.push({ tenantId, state: "reserved" });
|
|
65
|
-
const outcome = await this.replaceAllocations(current, allocations);
|
|
66
|
-
if (outcome === "applied")
|
|
67
|
-
return true;
|
|
68
|
-
if (outcome === "unknown")
|
|
69
|
-
throw new Error("Card capacity admission requires reconciliation");
|
|
70
|
-
}
|
|
71
|
-
throw new Error("Card capacity changed during admission; retry the request");
|
|
72
|
-
}
|
|
73
|
-
async confirm(id, tenantId) {
|
|
74
|
-
await this.changeAllocation(id, tenantId, "confirmed");
|
|
75
|
-
}
|
|
76
|
-
async releaseCancelled(id, tenantId) {
|
|
77
|
-
await this.changeAllocation(id, tenantId, undefined);
|
|
78
|
-
}
|
|
79
|
-
async changeAllocation(id, tenantId, state) {
|
|
80
|
-
for (let attempt = 0; attempt < MAX_ADMISSION_ATTEMPTS; attempt++) {
|
|
81
|
-
const current = await this.get(id);
|
|
82
|
-
if (!current ||
|
|
83
|
-
!current.allocations.some((allocation) => allocation.tenantId === tenantId))
|
|
84
|
-
return;
|
|
85
|
-
const allocations = current.allocations.filter((allocation) => allocation.tenantId !== tenantId);
|
|
86
|
-
if (state)
|
|
87
|
-
allocations.push({ tenantId, state });
|
|
88
|
-
const outcome = await this.replaceAllocations(current, allocations);
|
|
89
|
-
if (outcome === "applied")
|
|
90
|
-
return;
|
|
91
|
-
if (outcome === "unknown")
|
|
92
|
-
throw new Error("Card capacity outcome requires reconciliation");
|
|
93
|
-
}
|
|
94
|
-
throw new Error("Card capacity changed during reconciliation");
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
exports.CardCapacityModel = CardCapacityModel;
|
|
98
|
-
//# sourceMappingURL=card-capacity.model.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"card-capacity.model.js","sourceRoot":"","sources":["../../../src/workspaces/db/card-capacity.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { Table } from "@antelopejs/interface-database-decorators";
|
|
2
|
-
export interface CardCapacityAllocation {
|
|
3
|
-
tenantId: string;
|
|
4
|
-
state: "reserved" | "confirmed" | "reconciliation_required";
|
|
5
|
-
}
|
|
6
|
-
export declare const cardCapacitiesTableName = "saas_card_capacities";
|
|
7
|
-
export declare class CardCapacity extends Table {
|
|
8
|
-
_id: string;
|
|
9
|
-
revision: string;
|
|
10
|
-
allocations: CardCapacityAllocation[];
|
|
11
|
-
}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.CardCapacity = exports.cardCapacitiesTableName = void 0;
|
|
13
|
-
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
14
|
-
const constants_1 = require("@antelopejs/interface-dms/constants");
|
|
15
|
-
exports.cardCapacitiesTableName = "saas_card_capacities";
|
|
16
|
-
let CardCapacity = class CardCapacity extends interface_database_decorators_1.Table {
|
|
17
|
-
};
|
|
18
|
-
exports.CardCapacity = CardCapacity;
|
|
19
|
-
__decorate([
|
|
20
|
-
(0, interface_database_decorators_1.Field)("string"),
|
|
21
|
-
__metadata("design:type", String)
|
|
22
|
-
], CardCapacity.prototype, "_id", void 0);
|
|
23
|
-
__decorate([
|
|
24
|
-
(0, interface_database_decorators_1.Field)("string"),
|
|
25
|
-
__metadata("design:type", String)
|
|
26
|
-
], CardCapacity.prototype, "revision", void 0);
|
|
27
|
-
__decorate([
|
|
28
|
-
(0, interface_database_decorators_1.Field)("any"),
|
|
29
|
-
__metadata("design:type", Array)
|
|
30
|
-
], CardCapacity.prototype, "allocations", void 0);
|
|
31
|
-
exports.CardCapacity = CardCapacity = __decorate([
|
|
32
|
-
(0, interface_database_decorators_1.RegisterTable)(exports.cardCapacitiesTableName, constants_1.CORE_SCHEMA_NAME)
|
|
33
|
-
], CardCapacity);
|
|
34
|
-
//# sourceMappingURL=card-capacity.table.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"card-capacity.table.js","sourceRoot":"","sources":["../../../src/workspaces/db/card-capacity.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAImD;AACnD,mEAAuE;AAQ1D,QAAA,uBAAuB,GAAG,sBAAsB,CAAC;AAIvD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,qCAAK;CAStC,CAAA;AATY,oCAAY;AAEf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;yCACI;AAGZ;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;iDACiC;uBARnC,YAAY;IADxB,IAAA,6CAAa,EAAC,+BAAuB,EAAE,4BAAgB,CAAC;GAC5C,YAAY,CASxB"}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { Plan } from "../db";
|
|
2
|
-
export interface FreePlanAvailability {
|
|
3
|
-
isAvailable: boolean;
|
|
4
|
-
blockingWorkspaceName: string | null;
|
|
5
|
-
}
|
|
6
|
-
export declare function isFreePlan(plan: Plan): boolean;
|
|
7
|
-
export declare function resolveMaxFreeWorkspacesPerCard(): Promise<number>;
|
|
8
|
-
export declare function findFreeWorkspaceIdsBackedByCard(cardFingerprint: string): Promise<string[]>;
|
|
9
|
-
export declare function assertFreePlanAllowedForCard(plan: Plan, cardFingerprint: string | null): Promise<void>;
|
|
10
|
-
export declare function resolveFreePlanAvailability(freeWorkspaceNamesPerCard: string[][], limit: number): FreePlanAvailability;
|
|
11
|
-
export declare function resolveFreePlanAvailabilityForUser(userId: string): Promise<FreePlanAvailability>;
|
|
@@ -1,96 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isFreePlan = isFreePlan;
|
|
4
|
-
exports.resolveMaxFreeWorkspacesPerCard = resolveMaxFreeWorkspacesPerCard;
|
|
5
|
-
exports.findFreeWorkspaceIdsBackedByCard = findFreeWorkspaceIdsBackedByCard;
|
|
6
|
-
exports.assertFreePlanAllowedForCard = assertFreePlanAllowedForCard;
|
|
7
|
-
exports.resolveFreePlanAvailability = resolveFreePlanAvailability;
|
|
8
|
-
exports.resolveFreePlanAvailabilityForUser = resolveFreePlanAvailabilityForUser;
|
|
9
|
-
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
10
|
-
const interface_database_1 = require("@antelopejs/interface-database");
|
|
11
|
-
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
12
|
-
const db_1 = require("@antelopejs/interface-dms/db");
|
|
13
|
-
const db_2 = require("../db");
|
|
14
|
-
const utils_1 = require("../utils");
|
|
15
|
-
const HTTP_CONFLICT = 409;
|
|
16
|
-
const FREE_PLAN_PRICE = 0;
|
|
17
|
-
function isFreePlan(plan) {
|
|
18
|
-
return plan.price <= FREE_PLAN_PRICE;
|
|
19
|
-
}
|
|
20
|
-
async function resolveMaxFreeWorkspacesPerCard() {
|
|
21
|
-
const settings = await (0, interface_database_decorators_1.GetModel)(db_2.BillingSettingsModel).get(db_2.BILLING_SETTINGS_SINGLETON_ID);
|
|
22
|
-
return (settings?.maxFreeWorkspacesPerCard ?? db_2.DEFAULT_MAX_FREE_WORKSPACES_PER_CARD);
|
|
23
|
-
}
|
|
24
|
-
async function keepFreeSubscriptions(subscriptions) {
|
|
25
|
-
const planIds = [
|
|
26
|
-
...new Set(subscriptions
|
|
27
|
-
.map((sub) => sub.planId)
|
|
28
|
-
.filter((planId) => !!planId)),
|
|
29
|
-
];
|
|
30
|
-
if (planIds.length === 0)
|
|
31
|
-
return [];
|
|
32
|
-
const planModel = (0, interface_database_decorators_1.GetModel)(db_2.PlanModel);
|
|
33
|
-
const plans = await Promise.all(planIds.map((planId) => planModel.get(planId)));
|
|
34
|
-
const freePlanIds = new Set(plans
|
|
35
|
-
.filter((plan) => !!plan && isFreePlan(plan))
|
|
36
|
-
.map((plan) => plan._id));
|
|
37
|
-
return subscriptions.filter((sub) => sub.planId && freePlanIds.has(sub.planId));
|
|
38
|
-
}
|
|
39
|
-
async function resolveWorkspaceNames(subscriptions) {
|
|
40
|
-
const tenantIds = subscriptions.map((sub) => (0, utils_1.getRowInstance)(sub));
|
|
41
|
-
const tenants = await (0, interface_database_decorators_1.GetModel)(db_1.TenantModel).getMany(tenantIds);
|
|
42
|
-
return tenants.map((tenant) => tenant.name);
|
|
43
|
-
}
|
|
44
|
-
async function findFreeWorkspacesBackedByCard(cardFingerprint) {
|
|
45
|
-
const subscriptions = await (0, interface_database_decorators_1.GetModel)(db_2.TenantSubscriptionModel, interface_database_1.CROSS_INSTANCE).findByCardFingerprint(cardFingerprint);
|
|
46
|
-
const freeSubscriptions = await keepFreeSubscriptions(subscriptions);
|
|
47
|
-
if (freeSubscriptions.length === 0)
|
|
48
|
-
return [];
|
|
49
|
-
return resolveWorkspaceNames(freeSubscriptions);
|
|
50
|
-
}
|
|
51
|
-
async function findFreeWorkspaceIdsBackedByCard(cardFingerprint) {
|
|
52
|
-
const subscriptions = await (0, interface_database_decorators_1.GetModel)(db_2.TenantSubscriptionModel, interface_database_1.CROSS_INSTANCE).findByCardFingerprint(cardFingerprint);
|
|
53
|
-
const freeSubscriptions = await keepFreeSubscriptions(subscriptions);
|
|
54
|
-
return [
|
|
55
|
-
...new Set(freeSubscriptions.map((subscription) => (0, utils_1.getRowInstance)(subscription))),
|
|
56
|
-
];
|
|
57
|
-
}
|
|
58
|
-
async function assertFreePlanAllowedForCard(plan, cardFingerprint) {
|
|
59
|
-
if (!isFreePlan(plan) || !cardFingerprint)
|
|
60
|
-
return;
|
|
61
|
-
const [limit, workspaceNames] = await Promise.all([
|
|
62
|
-
resolveMaxFreeWorkspacesPerCard(),
|
|
63
|
-
findFreeWorkspacesBackedByCard(cardFingerprint),
|
|
64
|
-
]);
|
|
65
|
-
(0, interface_api_util_1.assert)(workspaceNames.length < limit, HTTP_CONFLICT, "saas.errors.workspace.free_limit_reached");
|
|
66
|
-
}
|
|
67
|
-
async function collectUserCardFingerprints(userId) {
|
|
68
|
-
const memberships = await (0, interface_database_decorators_1.GetModel)(db_1.TenantMemberModel, interface_database_1.CROSS_INSTANCE).listByUserWithTenantIds(userId);
|
|
69
|
-
const subscriptions = await Promise.all(memberships.map((membership) => (0, interface_database_decorators_1.GetModel)(db_2.TenantSubscriptionModel, membership.tenantId).findOne()));
|
|
70
|
-
const fingerprints = subscriptions
|
|
71
|
-
.map((subscription) => subscription?.cardFingerprint)
|
|
72
|
-
.filter((fingerprint) => !!fingerprint);
|
|
73
|
-
return new Set(fingerprints);
|
|
74
|
-
}
|
|
75
|
-
function resolveFreePlanAvailability(freeWorkspaceNamesPerCard, limit) {
|
|
76
|
-
if (freeWorkspaceNamesPerCard.length === 0) {
|
|
77
|
-
return { isAvailable: true, blockingWorkspaceName: null };
|
|
78
|
-
}
|
|
79
|
-
const hasCardWithRoom = freeWorkspaceNamesPerCard.some((workspaceNames) => workspaceNames.length < limit);
|
|
80
|
-
if (hasCardWithRoom) {
|
|
81
|
-
return { isAvailable: true, blockingWorkspaceName: null };
|
|
82
|
-
}
|
|
83
|
-
return {
|
|
84
|
-
isAvailable: false,
|
|
85
|
-
blockingWorkspaceName: freeWorkspaceNamesPerCard.flat()[0] ?? null,
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
async function resolveFreePlanAvailabilityForUser(userId) {
|
|
89
|
-
const fingerprints = await collectUserCardFingerprints(userId);
|
|
90
|
-
const [limit, usages] = await Promise.all([
|
|
91
|
-
resolveMaxFreeWorkspacesPerCard(),
|
|
92
|
-
Promise.all([...fingerprints].map((fingerprint) => findFreeWorkspacesBackedByCard(fingerprint))),
|
|
93
|
-
]);
|
|
94
|
-
return resolveFreePlanAvailability(usages, limit);
|
|
95
|
-
}
|
|
96
|
-
//# sourceMappingURL=free-workspace-guard.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"free-workspace-guard.js","sourceRoot":"","sources":["../../src/workspaces/free-workspace-guard.ts"],"names":[],"mappings":"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"}
|