@antelopejs/dms-saas 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -5
- package/dist/data-api/platformOwner/users.js +1 -1
- package/dist/data-api/platformOwner/users.js.map +1 -1
- package/dist/metrics/directory-summary.js +8 -1
- package/dist/metrics/directory-summary.js.map +1 -1
- package/dist/operator-actions/db/lifecycle-delivery.model.js +19 -11
- package/dist/operator-actions/db/lifecycle-delivery.model.js.map +1 -1
- package/dist/pages/platform/users/index.js +1 -1
- package/dist/pages/platform/users/index.js.map +1 -1
- package/dist/plan-changes/guarded-free.js +5 -1
- package/dist/plan-changes/guarded-free.js.map +1 -1
- package/dist/plan-changes/guarded-landing.js +4 -2
- package/dist/plan-changes/guarded-landing.js.map +1 -1
- package/dist/plan-changes/guarded-state.js +2 -0
- package/dist/plan-changes/guarded-state.js.map +1 -1
- package/dist/plans/catalogue-usage.js +6 -4
- package/dist/plans/catalogue-usage.js.map +1 -1
- package/dist/plans/plan-diff.d.ts +3 -3
- package/dist/plans/plan-diff.js.map +1 -1
- package/dist/plans/plan-write.d.ts +3 -1
- package/dist/plans/plan-write.js +11 -2
- package/dist/plans/plan-write.js.map +1 -1
- package/dist/routes/platformOwner/plans.d.ts +9 -4
- package/dist/routes/platformOwner/plans.js +3 -0
- package/dist/routes/platformOwner/plans.js.map +1 -1
- package/dist/routes/platformOwner/workspaces-admin.js +24 -11
- package/dist/routes/platformOwner/workspaces-admin.js.map +1 -1
- package/dist/routes/public/register.d.ts +2 -0
- package/dist/routes/public/register.js +4 -0
- package/dist/routes/public/register.js.map +1 -1
- package/dist/utils/segment-matching.js +19 -10
- package/dist/utils/segment-matching.js.map +1 -1
- package/dist/utils/workspace-records.d.ts +8 -0
- package/dist/utils/workspace-records.js +55 -0
- package/dist/utils/workspace-records.js.map +1 -0
- package/dist/workspaces/default-plan.js +22 -15
- package/dist/workspaces/default-plan.js.map +1 -1
- package/frontend-vue/app/build/public/pricing.ts +3 -0
- package/frontend-vue/app/components/WorkspaceDetailHeader.vue +3 -1
- package/frontend-vue/app/composables/registrationCardPolicy.ts +56 -0
- package/frontend-vue/app/composables/useSaasRegistration.ts +14 -47
- package/frontend-vue/app/custom-pages/auth/no-workspace.vue +6 -4
- package/frontend-vue/i18n/locales/saas-en-GB.json +1 -0
- package/frontend-vue/i18n/locales/saas-fr-FR.json +1 -0
- package/package.json +7 -6
- package/skills/dms-saas/SKILL.md +5 -3
package/README.md
CHANGED
|
@@ -46,7 +46,7 @@ export default defineConfig({
|
|
|
46
46
|
},
|
|
47
47
|
modules: {
|
|
48
48
|
"dms-saas": {
|
|
49
|
-
source: { type: "package", package: "@antelopejs/dms-saas", version: "^0.
|
|
49
|
+
source: { type: "package", package: "@antelopejs/dms-saas", version: "^0.11.0" },
|
|
50
50
|
config: {
|
|
51
51
|
stripe: {
|
|
52
52
|
secretKey: "sk_test_placeholder",
|
|
@@ -60,7 +60,7 @@ export default defineConfig({
|
|
|
60
60
|
});
|
|
61
61
|
```
|
|
62
62
|
|
|
63
|
-
Then point a Stripe webhook at `https://<api>/api/saas/webhooks/stripe`, and publish a free plan in **Modules › SaaS › Plans**. Registration opens every workspace on that plan. With placeholder keys, the module still runs, and the blocks that need Stripe say so.
|
|
63
|
+
Then point a Stripe webhook at `https://<api>/api/saas/webhooks/stripe`, and publish a free plan in **Modules › SaaS › Plans**. Registration opens every workspace on that plan. With placeholder keys, the module still runs, and the blocks that need Stripe say so. Without a usable secret key, registration takes no card, and its screens drop their card step once they have loaded the plan.
|
|
64
64
|
|
|
65
65
|
## Compatibility
|
|
66
66
|
|
|
@@ -69,14 +69,14 @@ Then point a Stripe webhook at `https://<api>/api/saas/webhooks/stripe`, and pub
|
|
|
69
69
|
| Package | Supported | Tested with |
|
|
70
70
|
| ------------------------------------------- | ----------------- | ----------- |
|
|
71
71
|
| `@antelopejs/interface-api` | `>=0.3.0 <1.0.0` | `0.3.0` |
|
|
72
|
-
| `@antelopejs/interface-api-util` | `>=0.3.
|
|
72
|
+
| `@antelopejs/interface-api-util` | `>=0.3.2 <1.0.0` | `0.3.2` |
|
|
73
73
|
| `@antelopejs/interface-core` | `>=0.4.0 <1.0.0` | `0.4.0` |
|
|
74
74
|
| `@antelopejs/interface-data-api` | `>=0.6.1 <1.0.0` | `0.6.1` |
|
|
75
75
|
| `@antelopejs/interface-database` | `>=0.3.0 <1.0.0` | `0.3.0` |
|
|
76
|
-
| `@antelopejs/interface-database-decorators` | `>=0.
|
|
76
|
+
| `@antelopejs/interface-database-decorators` | `>=0.3.1 <1.0.0` | `0.3.1` |
|
|
77
77
|
| `@antelopejs/interface-dms` | `>=0.12.0 <1.0.0` | `0.12.0` |
|
|
78
78
|
| `@antelopejs/interface-dms-automation` | `>=0.6.0 <1.0.0` | `0.6.0` |
|
|
79
|
-
| `@antelopejs/interface-dms-saas` | `workspace:^` | `0.
|
|
79
|
+
| `@antelopejs/interface-dms-saas` | `workspace:^` | `0.8.0` |
|
|
80
80
|
|
|
81
81
|
<!-- antelopejs-docs-compat:end -->
|
|
82
82
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/data-api/platformOwner/users.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/data-api/platformOwner/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ function summariseDirectory(rows, now, reportingCurrency) {
|
|
|
83
83
|
complimentaryEnding,
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
-
async function
|
|
86
|
+
async function readDirectoryRows() {
|
|
87
87
|
return (0, interface_database_decorators_1.GetModel)(db_2.TenantBillingStateModel)
|
|
88
88
|
.table.filter((row) => row
|
|
89
89
|
.key("deletedAt")
|
|
@@ -91,6 +91,13 @@ async function loadDirectoryRows() {
|
|
|
91
91
|
.and(row.key("_id").eq(row.key("tenantId"))))
|
|
92
92
|
.run();
|
|
93
93
|
}
|
|
94
|
+
let inFlightRows;
|
|
95
|
+
function loadDirectoryRows() {
|
|
96
|
+
inFlightRows ??= readDirectoryRows().finally(() => {
|
|
97
|
+
inFlightRows = undefined;
|
|
98
|
+
});
|
|
99
|
+
return inFlightRows;
|
|
100
|
+
}
|
|
94
101
|
async function nameWorkspaces(entries) {
|
|
95
102
|
if (entries.length === 0)
|
|
96
103
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory-summary.js","sourceRoot":"","sources":["../../src/metrics/directory-summary.ts"],"names":[],"mappings":";;AAuEA,0DAgBC;AAuCD,gDAqCC;
|
|
1
|
+
{"version":3,"file":"directory-summary.js","sourceRoot":"","sources":["../../src/metrics/directory-summary.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,10 @@ const lifecycle_delivery_table_1 = require("./lifecycle-delivery.table");
|
|
|
8
8
|
const REPLAYABLE_STATUSES = ["pending", "failed", "running"];
|
|
9
9
|
const CLAIMABLE_STATUSES = new Set(["pending", "failed"]);
|
|
10
10
|
const CLAIM_LEASE_MS = 10 * 60 * 1000;
|
|
11
|
+
const PROVISIONING_ATTEMPTS = 5;
|
|
11
12
|
function isLifecycleDeliveryClaimable(delivery, now = Date.now()) {
|
|
13
|
+
if (delivery.provisioningState === "preparing")
|
|
14
|
+
return false;
|
|
12
15
|
if (CLAIMABLE_STATUSES.has(delivery.status))
|
|
13
16
|
return true;
|
|
14
17
|
if (delivery.status !== "running")
|
|
@@ -17,22 +20,27 @@ function isLifecycleDeliveryClaimable(delivery, now = Date.now()) {
|
|
|
17
20
|
}
|
|
18
21
|
class LifecycleDeliveryModel extends (0, interface_database_decorators_1.BasicDataModel)(lifecycle_delivery_table_1.LifecycleDelivery, lifecycle_delivery_table_1.lifecycleDeliveriesTableName) {
|
|
19
22
|
async transitionProvisioning(id, expected, next, invoiceId) {
|
|
20
|
-
const current = await this.get(id);
|
|
21
|
-
if (!current)
|
|
22
|
-
throw new Error("Workspace provisioning state is missing");
|
|
23
|
-
if (current.provisioningState === next &&
|
|
24
|
-
(invoiceId === undefined || invoiceId === current.provisioningInvoiceId))
|
|
25
|
-
return;
|
|
26
|
-
if (current.provisioningState !== expected)
|
|
27
|
-
throw new Error("Workspace provisioning state changed");
|
|
28
23
|
const patch = { provisioningState: next };
|
|
29
24
|
if (invoiceId !== undefined)
|
|
30
25
|
patch.provisioningInvoiceId = invoiceId;
|
|
31
26
|
if (next === "cancelled")
|
|
32
27
|
patch.status = "succeeded";
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
28
|
+
for (let attempt = 0; attempt < PROVISIONING_ATTEMPTS; attempt += 1) {
|
|
29
|
+
const current = await this.get(id);
|
|
30
|
+
if (!current)
|
|
31
|
+
throw new Error("Workspace provisioning state is missing");
|
|
32
|
+
if (current.provisioningState === next &&
|
|
33
|
+
(invoiceId === undefined || invoiceId === current.provisioningInvoiceId))
|
|
34
|
+
return;
|
|
35
|
+
if (current.provisioningState !== expected)
|
|
36
|
+
throw new Error("Workspace provisioning state changed");
|
|
37
|
+
const outcome = await this.mutate(current, patch);
|
|
38
|
+
if (outcome === "applied")
|
|
39
|
+
return;
|
|
40
|
+
if (outcome === "unknown")
|
|
41
|
+
throw new Error("Workspace provisioning unknown; reconcile before retry");
|
|
42
|
+
}
|
|
43
|
+
throw new Error("Workspace provisioning contended; reconcile before retry");
|
|
36
44
|
}
|
|
37
45
|
async findByOperation(operationId) {
|
|
38
46
|
return this.getBy("operationId", operationId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-delivery.model.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.model.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lifecycle-delivery.model.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ const USER_TABS = [
|
|
|
31
31
|
id: "unverified",
|
|
32
32
|
label: "$saas.users.tabs.unverified",
|
|
33
33
|
icon: "i-ph-envelope-simple",
|
|
34
|
-
filter: { accessorKey: "isValidated", value: "
|
|
34
|
+
filter: { accessorKey: "isValidated", value: "true", mode: "is_not" },
|
|
35
35
|
},
|
|
36
36
|
];
|
|
37
37
|
let SaasUsersListController = class SaasUsersListController extends (0, page_1.PageController)("users", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/pages/platform/users/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAA8E;AAC9E,yDAA2D;AAC3D,oEAAuE;AACvE,gDAAqD;AACrD,yCAA8C;AAC9C,8CAAkD;AAElD,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,mBAAmB,GAAG,uCAAuC,CAAC;AAEpE,MAAM,SAAS,GAAG;IAChB;QACE,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,sBAAsB;QAC7B,IAAI,EAAE,YAAY;KACnB;IACD;QACE,EAAE,EAAE,iBAAiB;QACrB,KAAK,EAAE,kCAAkC;QACzC,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;KAC5D;IACD;QACE,EAAE,EAAE,YAAY;QAChB,KAAK,EAAE,6BAA6B;QACpC,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/pages/platform/users/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,7 +133,11 @@ async function cancelGuardedFreeChange(tenantId) {
|
|
|
133
133
|
if (change.phase === "preparing")
|
|
134
134
|
await (0, guarded_state_1.abortGuardedPreparation)(model, current);
|
|
135
135
|
await (0, inventory_barrier_1.releasePlanInventory)(tenantId, change);
|
|
136
|
-
|
|
136
|
+
const aborted = await readSubscription(tenantId);
|
|
137
|
+
if (aborted.guardedPlanChange?.operationId === change.operationId &&
|
|
138
|
+
aborted.guardedPlanChange.phase === "aborting") {
|
|
139
|
+
await (0, guarded_state_1.completeGuardedAbort)(model, aborted);
|
|
140
|
+
}
|
|
137
141
|
return;
|
|
138
142
|
}
|
|
139
143
|
await (0, guarded_state_1.admitGuardedCancellation)(model, current);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guarded-free.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-free.ts"],"names":[],"mappings":";;;AA4CA,4DAgBC;AAuDD,8DA+DC;AAGD,
|
|
1
|
+
{"version":3,"file":"guarded-free.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-free.ts"],"names":[],"mappings":"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"}
|
|
@@ -225,9 +225,11 @@ async function validateAndCommitFree(tenantId, current, change) {
|
|
|
225
225
|
await (0, inventory_barrier_1.releasePlanInventory)(tenantId, effective);
|
|
226
226
|
}
|
|
227
227
|
const latest = await model.findOne();
|
|
228
|
-
if (latest?.guardedPlanChange?.
|
|
228
|
+
if (latest?.guardedPlanChange?.barrierId !== effective.barrierId)
|
|
229
|
+
return;
|
|
230
|
+
if (latest.guardedPlanChange.phase === "blocked")
|
|
229
231
|
await notifyBlocked(tenantId, latest.guardedPlanChange);
|
|
230
|
-
else
|
|
232
|
+
else
|
|
231
233
|
await completeFreeActivation(tenantId, latest);
|
|
232
234
|
}
|
|
233
235
|
//# sourceMappingURL=guarded-landing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guarded-landing.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-landing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"guarded-landing.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-landing.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,8 @@ function requirePhase(current, phase) {
|
|
|
73
73
|
}
|
|
74
74
|
async function admitGuardedProviderEffect(model, current) {
|
|
75
75
|
const change = requirePhase(current, "preparing");
|
|
76
|
+
if (isGuardedPlanChangeBlocked(current))
|
|
77
|
+
throw new Error("The downgrade deadline has passed");
|
|
76
78
|
await compareAndSet(model, current, {
|
|
77
79
|
guardedPlanChange: { ...change, phase: "provider_pending" },
|
|
78
80
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guarded-state.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-state.ts"],"names":[],"mappings":";;AAOA,gEAWC;AAiBD,4DA6BC;AAMD,0DAQC;AAGD,oDAWC;
|
|
1
|
+
{"version":3,"file":"guarded-state.js","sourceRoot":"","sources":["../../src/plan-changes/guarded-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,11 +112,13 @@ async function readCatalogueUsage() {
|
|
|
112
112
|
]);
|
|
113
113
|
return summariseCatalogueUsage(plans, rows);
|
|
114
114
|
}
|
|
115
|
-
let
|
|
115
|
+
let sharedUsage;
|
|
116
116
|
function loadCatalogueUsage() {
|
|
117
|
-
|
|
118
|
-
|
|
117
|
+
sharedUsage ??= readCatalogueUsage().finally(() => {
|
|
118
|
+
setImmediate(() => {
|
|
119
|
+
sharedUsage = undefined;
|
|
120
|
+
});
|
|
119
121
|
});
|
|
120
|
-
return
|
|
122
|
+
return sharedUsage;
|
|
121
123
|
}
|
|
122
124
|
//# sourceMappingURL=catalogue-usage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogue-usage.js","sourceRoot":"","sources":["../../src/plans/catalogue-usage.ts"],"names":[],"mappings":";;AA+EA,oDAEC;AAMD,0DAYC;AAGD,wCAWC;AAgCD,0DA0BC;AAQD,oCAOC;AA0BD,8CAQC;
|
|
1
|
+
{"version":3,"file":"catalogue-usage.js","sourceRoot":"","sources":["../../src/plans/catalogue-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { Feature, PlanFeatureValue, PlanMigrationFeatureDiff } from "../db";
|
|
1
|
+
import type { Feature, FeatureValue, PlanFeatureValue, PlanMigrationFeatureDiff } from "../db";
|
|
2
2
|
export type PlanChangeKind = "lost" | "gained" | "changed" | "same";
|
|
3
3
|
export interface FeatureChange {
|
|
4
4
|
featureId: string;
|
|
5
|
-
from:
|
|
6
|
-
to:
|
|
5
|
+
from: FeatureValue;
|
|
6
|
+
to: FeatureValue;
|
|
7
7
|
kind: PlanChangeKind;
|
|
8
8
|
}
|
|
9
9
|
export type ComparedFeature = Pick<Feature, "_id" | "valueType">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-diff.js","sourceRoot":"","sources":["../../src/plans/plan-diff.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"plan-diff.js","sourceRoot":"","sources":["../../src/plans/plan-diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Feature, FeatureValues, Plan, PlanFeatureValue, PlanLocalizedText } from "../db";
|
|
1
|
+
import type { Feature, FeatureValues, Plan, PlanBillingMode, PlanFeatureValue, PlanLocalizedText } from "../db";
|
|
2
2
|
import type { JsonValue } from "@antelopejs/interface-dms-saas/json";
|
|
3
3
|
export declare const FEATURE_OFF_VALUE = 0;
|
|
4
4
|
export interface PlanInheritanceInput {
|
|
@@ -23,4 +23,6 @@ export declare function toPlanRow(write: PlanWrite): Plan;
|
|
|
23
23
|
export declare function slugify(value: string): string;
|
|
24
24
|
export declare function invalidFeatureValues(values: PlanFeatureValue[], catalogue: Pick<Feature, "_id" | "valueType">[]): string[];
|
|
25
25
|
export declare function isValidMemberCap(value: JsonValue | undefined): boolean;
|
|
26
|
+
export declare const DEFAULT_PLAN_BILLING_MODE: PlanBillingMode;
|
|
27
|
+
export declare function assertWritableBillingMode(value: JsonValue | undefined): void;
|
|
26
28
|
export {};
|
package/dist/plans/plan-write.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PLAN_WRITE_FIELDS = exports.FEATURE_OFF_VALUE = void 0;
|
|
3
|
+
exports.DEFAULT_PLAN_BILLING_MODE = exports.PLAN_WRITE_FIELDS = exports.FEATURE_OFF_VALUE = void 0;
|
|
4
4
|
exports.expandInheritance = expandInheritance;
|
|
5
5
|
exports.toInheritance = toInheritance;
|
|
6
6
|
exports.pickPlanWrite = pickPlanWrite;
|
|
@@ -10,11 +10,14 @@ exports.toPlanRow = toPlanRow;
|
|
|
10
10
|
exports.slugify = slugify;
|
|
11
11
|
exports.invalidFeatureValues = invalidFeatureValues;
|
|
12
12
|
exports.isValidMemberCap = isValidMemberCap;
|
|
13
|
+
exports.assertWritableBillingMode = assertWritableBillingMode;
|
|
14
|
+
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
13
15
|
const plan_permission_tree_1 = require("./plan-permission-tree");
|
|
14
16
|
const db_1 = require("../db");
|
|
15
17
|
const primitive_guards_1 = require("../utils/primitive-guards");
|
|
16
18
|
exports.FEATURE_OFF_VALUE = 0;
|
|
17
19
|
const MIN_LIMIT = 1;
|
|
20
|
+
const HTTP_BAD_REQUEST = 400;
|
|
18
21
|
const SLUG_MAX_LENGTH = 100;
|
|
19
22
|
const COMBINING_MARKS = /[̀-ͯ]/g;
|
|
20
23
|
const NON_SLUG_CHARACTERS = /[^a-z0-9]+/g;
|
|
@@ -120,7 +123,9 @@ function perLocaleTexts(stored) {
|
|
|
120
123
|
return texts;
|
|
121
124
|
}
|
|
122
125
|
function toPlanRow(write) {
|
|
123
|
-
return db_1.PlanModel.fromPlainData(write)
|
|
126
|
+
return db_1.PlanModel.fromPlainData(write)
|
|
127
|
+
.localize("*", db_1.PLAN_LOCALIZED_FIELDS)
|
|
128
|
+
.localize(db_1.PLAN_FALLBACK_LOCALE, db_1.PLAN_LOCALIZED_FIELDS);
|
|
124
129
|
}
|
|
125
130
|
function slugify(value) {
|
|
126
131
|
return value
|
|
@@ -159,4 +164,8 @@ function isValidMemberCap(value) {
|
|
|
159
164
|
Number.isInteger(value) &&
|
|
160
165
|
(value >= MIN_LIMIT || value === db_1.PLAN_UNLIMITED));
|
|
161
166
|
}
|
|
167
|
+
exports.DEFAULT_PLAN_BILLING_MODE = "flat";
|
|
168
|
+
function assertWritableBillingMode(value) {
|
|
169
|
+
(0, interface_api_util_1.assert)(value === undefined || db_1.PLAN_BILLING_MODES.some((mode) => mode === value), HTTP_BAD_REQUEST, "saas.errors.plan.invalid_billing_mode");
|
|
170
|
+
}
|
|
162
171
|
//# sourceMappingURL=plan-write.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-write.js","sourceRoot":"","sources":["../../src/plans/plan-write.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"plan-write.js","sourceRoot":"","sources":["../../src/plans/plan-write.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,14 @@ export declare class SaasPlansApiController extends SaasPlansApiController_base
|
|
|
71
71
|
getOne(_user: User, id: string): Promise<{
|
|
72
72
|
inheritance: import("../../plans/plan-write").PlanInheritanceInput;
|
|
73
73
|
_id?: string | undefined;
|
|
74
|
+
localize?: {
|
|
75
|
+
<This extends {
|
|
76
|
+
constructor: any;
|
|
77
|
+
}, K extends keyof This>(this: This, locale: "*", fields: readonly K[]): import("@antelopejs/interface-database-decorators").LocalizedRecords<This, K>;
|
|
78
|
+
<This extends {
|
|
79
|
+
constructor: any;
|
|
80
|
+
}>(this: This, locale: string, fields?: ReadonlyArray<keyof This>): This;
|
|
81
|
+
} | undefined;
|
|
74
82
|
createdAt?: Date | undefined;
|
|
75
83
|
updatedAt?: Date | undefined;
|
|
76
84
|
name?: string | undefined;
|
|
@@ -78,6 +86,7 @@ export declare class SaasPlansApiController extends SaasPlansApiController_base
|
|
|
78
86
|
permissions?: string[] | undefined;
|
|
79
87
|
order?: number | undefined;
|
|
80
88
|
features?: import("@antelopejs/interface-dms-saas/db").PlanFeatureValue[] | undefined;
|
|
89
|
+
borderLabel?: string | null | undefined;
|
|
81
90
|
slug?: string | undefined;
|
|
82
91
|
audience?: "any" | "individual" | "business" | undefined;
|
|
83
92
|
price?: number | undefined;
|
|
@@ -90,12 +99,8 @@ export declare class SaasPlansApiController extends SaasPlansApiController_base
|
|
|
90
99
|
isPublic?: boolean | undefined;
|
|
91
100
|
paymentProviderRefs?: import("@antelopejs/interface-dms-saas/db").PlanProviderRefs | undefined;
|
|
92
101
|
borderColor?: string | null | undefined;
|
|
93
|
-
borderLabel?: string | null | undefined;
|
|
94
102
|
isActive?: boolean | undefined;
|
|
95
103
|
isDeleted?: boolean | undefined;
|
|
96
|
-
localize?: (<This extends {
|
|
97
|
-
constructor: any;
|
|
98
|
-
}>(this: This, locale: string, fields?: Array<keyof This>) => This) | undefined;
|
|
99
104
|
}>;
|
|
100
105
|
private assertValidAccess;
|
|
101
106
|
create(_user: User, body: PlanWriteBody): Promise<PlanWriteResult>;
|
|
@@ -244,6 +244,7 @@ class SaasPlansApiController extends (0, interface_api_1.Controller)("/api/saas/
|
|
|
244
244
|
async createPlan(body) {
|
|
245
245
|
const sanitized = (0, plan_write_1.pickPlanWrite)(readableWrite(body));
|
|
246
246
|
assertPlanInterval(sanitized.interval);
|
|
247
|
+
(0, plan_write_1.assertWritableBillingMode)(sanitized.billingMode);
|
|
247
248
|
await this.assertValidAccess(sanitized);
|
|
248
249
|
const fallbackName = sanitized.name?.[db_1.PLAN_FALLBACK_LOCALE];
|
|
249
250
|
if (!sanitized.slug && fallbackName) {
|
|
@@ -253,6 +254,7 @@ class SaasPlansApiController extends (0, interface_api_1.Controller)("/api/saas/
|
|
|
253
254
|
const inserted = await this.planModel.insert([
|
|
254
255
|
(0, plan_write_1.toPlanRow)({
|
|
255
256
|
...sanitized,
|
|
257
|
+
billingMode: sanitized.billingMode ?? plan_write_1.DEFAULT_PLAN_BILLING_MODE,
|
|
256
258
|
isActive: sanitized.isActive ?? true,
|
|
257
259
|
isDeleted: false,
|
|
258
260
|
isPublic: sanitized.isPublic ?? true,
|
|
@@ -283,6 +285,7 @@ class SaasPlansApiController extends (0, interface_api_1.Controller)("/api/saas/
|
|
|
283
285
|
const plan = await this.planModel.get(id);
|
|
284
286
|
(0, interface_api_util_1.assert)(plan, HTTP_NOT_FOUND, "saas.errors.plan.not_found");
|
|
285
287
|
const sanitized = (0, plan_write_1.pickPlanWrite)(readableWrite(body));
|
|
288
|
+
(0, plan_write_1.assertWritableBillingMode)(sanitized.billingMode);
|
|
286
289
|
await this.assertValidAccess(sanitized);
|
|
287
290
|
if (sanitized.inheritsFromPlanId !== undefined) {
|
|
288
291
|
await ensureInheritanceIsAcyclic(this.planModel, id, sanitized.inheritsFromPlanId);
|