@antelopejs/dms-saas 0.10.0 → 0.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dist/data-api/platformOwner/users.js +1 -1
- package/dist/data-api/platformOwner/users.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/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 +8 -1
- package/dist/plans/plan-write.js.map +1 -1
- package/dist/routes/platformOwner/plans.js +3 -0
- package/dist/routes/platformOwner/plans.js.map +1 -1
- package/dist/routes/platformOwner/workspaces-admin.js +8 -2
- 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 +1 -0
- package/dist/routes/public/register.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 +5 -4
- package/skills/dms-saas/SKILL.md +3 -1
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.10.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
|
|
|
@@ -76,7 +76,7 @@ Then point a Stripe webhook at `https://<api>/api/saas/webhooks/stripe`, and pub
|
|
|
76
76
|
| `@antelopejs/interface-database-decorators` | `>=0.2.0 <1.0.0` | `0.2.0` |
|
|
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.7.1` |
|
|
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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"}
|
|
@@ -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":";;;AA4CA,4DAgBC;AAuDD,8DA+DC;AAGD,0DAsCC;AA3ND,6CAAyC;AACzC,6FAAqE;AAErE,8BAMe;AACf,2EAGkD;AAClD,6CAAmD;AACnD,6DAAqE;AACrE,mDAQyB;AACzB,2DAA+E;AAG/E,MAAa,2BAA4B,SAAQ,KAAK;IAC/B;IAArB,YAAqB,iBAA8C;QACjE,KAAK,CAAC,oDAAoD,CAAC,CAAC;QADzC,sBAAiB,GAAjB,iBAAiB,CAA6B;IAEnE,CAAC;CACF;AAJD,kEAIC;AAED,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAQ,EACjC,4BAAuB,EACvB,QAAQ,CACT,CAAC,OAAO,EAAE,CAAC;IACZ,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACxE,OAAO,YAAY,CAAC;AACtB,CAAC;AAGM,KAAK,UAAU,wBAAwB,CAC5C,QAAgB,EAChB,UAAgB;IAEhB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,IAAA,wCAAyB,EAAC;QAC7C,QAAQ;QACR,WAAW,EAAE,OAAO,CAAC,MAAM;YACzB,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC;YAC3D,CAAC,CAAC,IAAI;QACR,UAAU;QACV,WAAW,EAAE,IAAA,wBAAU,GAAE;QACzB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,OAAO,CAAC,gBAAgB,IAAI,IAAI;KAC9C,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;AACnE,CAAC;AAGD,KAAK,UAAU,iBAAiB,CAC9B,QAAgB,EAChB,UAAgB;IAEhB,IAAI,UAAU,CAAC,KAAK,KAAK,CAAC,IAAI,UAAU,CAAC,mBAAmB,EAAE,aAAa,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,kCAAmB,GAAE,CAAC;IACrC,MAAM,KAAK,GAAG,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO,CAAC,oBAAoB,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAC9C,OAAO,CAAC,oBAAoB,CAC7B,CAAC;IACF,MAAM,WAAW,GAAG,IAAA,0CAAyB,EAAC,IAAI,CAAC,CAAC;IACpD,IACE,CAAC,WAAW;QACZ,WAAW,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,oBAAoB,EACzB,CAAC;QACD,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAsB;QAChC,WAAW,EAAE,IAAA,wBAAU,GAAE;QACzB,UAAU,EAAE,MAAM,CAAC,IAAI;QACvB,YAAY,EAAE,UAAU,CAAC,GAAG;QAC5B,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;QAClD,WAAW;QACX,WAAW,EAAE,IAAI,IAAI,EAAE;QACvB,SAAS,EAAE,IAAA,wBAAU,GAAE;QACvB,KAAK,EAAE,WAAW;QAClB,iBAAiB,EAAE,EAAE;KACtB,CAAC;IACF,MAAM,IAAA,wCAAwB,EAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,MAAM,CAAC;AAChB,CAAC;AAUM,KAAK,UAAU,yBAAyB,CAC7C,QAAgB,EAChB,UAAgB;IAEhB,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAA,sCAAkB,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAA,wCAAyB,EAC5C;YACE,QAAQ;YACR,WAAW,EAAE,OAAO,CAAC,MAAM;gBACzB,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,wCAAQ,EAAC,cAAS,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC;gBAC3D,CAAC,CAAC,IAAI;YACR,UAAU;YACV,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,KAAK,EAAE,UAAU;YACjB,WAAW;SACZ,EACD,MAAM,CAAC,UAAU,CAClB,CAAC;QACF,IAAI,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,IAAA,0CAA0B,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChD,IACE,MAAM,CAAC,iBAAiB,EAAE,WAAW,KAAK,MAAM,CAAC,WAAW;YAC5D,MAAM,CAAC,iBAAiB,CAAC,KAAK,KAAK,WAAW,EAC9C,CAAC;YACD,MAAM,IAAA,uCAAuB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,IAAA,wCAAoB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,IACE,OAAO,CAAC,iBAAiB,EAAE,WAAW,KAAK,MAAM,CAAC,WAAW;YAC7D,OAAO,CAAC,iBAAiB,CAAC,KAAK,KAAK,UAAU,EAC9C,CAAC;YACD,MAAM,IAAA,oCAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,IAAA,wCAAoB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAC/B,MAAM,CAAC,oBAAoB,EAC3B,EAAE,oBAAoB,EAAE,IAAI,EAAE,EAC9B;QACE,cAAc,EAAE,2BAA2B,MAAM,CAAC,WAAW,EAAE;KAChE,CACF,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CACnD,MAAM,CAAC,oBAAoB,CAC5B,CAAC;IACF,IACE,CAAC,SAAS,CAAC,oBAAoB;QAC/B,SAAS,CAAC,QAAQ;QAClB,IAAA,0CAAyB,EAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,WAAW,CAAC,OAAO,EAAE,EACzE,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,IAAA,sCAAsB,EAAC,KAAK,EAAE,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtE,OAAO,WAAW,CAAC;AACrB,CAAC;AAGM,KAAK,UAAU,uBAAuB,CAAC,QAAgB;IAC5D,MAAM,KAAK,GAAG,IAAA,wCAAQ,EAAC,4BAAuB,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACzC,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAChE,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW;YAC9B,MAAM,IAAA,uCAAuB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,IAAA,wCAAoB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,IACE,OAAO,CAAC,iBAAiB,EAAE,WAAW,KAAK,MAAM,CAAC,WAAW;YAC7D,OAAO,CAAC,iBAAiB,CAAC,KAAK,KAAK,UAAU,EAC9C,CAAC;YACD,MAAM,IAAA,oCAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,IAAA,wCAAwB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAC/B,MAAM,CAAC,oBAAoB,EAC3B,EAAE,oBAAoB,EAAE,KAAK,EAAE,EAC/B;QACE,cAAc,EAAE,yBAAyB,MAAM,CAAC,WAAW,EAAE;KAC9D,CACF,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CACnD,MAAM,CAAC,oBAAoB,CAC5B,CAAC;IACF,IACE,SAAS,CAAC,MAAM,KAAK,QAAQ;QAC7B,SAAS,CAAC,oBAAoB;QAC9B,SAAS,CAAC,QAAQ,EAClB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,IAAA,0CAA0B,EAAC,KAAK,EAAE,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -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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"}
|
|
@@ -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;
|
|
@@ -159,4 +162,8 @@ function isValidMemberCap(value) {
|
|
|
159
162
|
Number.isInteger(value) &&
|
|
160
163
|
(value >= MIN_LIMIT || value === db_1.PLAN_UNLIMITED));
|
|
161
164
|
}
|
|
165
|
+
exports.DEFAULT_PLAN_BILLING_MODE = "flat";
|
|
166
|
+
function assertWritableBillingMode(value) {
|
|
167
|
+
(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");
|
|
168
|
+
}
|
|
162
169
|
//# 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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"}
|
|
@@ -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);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plans.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/plans.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plans.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/plans.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,7 @@ const HTTP_NOT_FOUND = 404;
|
|
|
41
41
|
const HTTP_BAD_REQUEST = 400;
|
|
42
42
|
const HTTP_CONFLICT = 409;
|
|
43
43
|
const ACTIVE_STATUS = "active";
|
|
44
|
+
const CANCELLED_STATUS = "cancelled";
|
|
44
45
|
const COMP_ICON = "i-ph-gift";
|
|
45
46
|
const NOTIF_COMP_TITLE = "$saas.notifications.payload.complimentary_access_granted.title";
|
|
46
47
|
const NOTIF_COMP_DESC = "$saas.notifications.payload.complimentary_access_granted.description";
|
|
@@ -73,9 +74,13 @@ function joinConfirmationDialog(view, isMember) {
|
|
|
73
74
|
],
|
|
74
75
|
};
|
|
75
76
|
}
|
|
77
|
+
function assertNotCancelled(subscription) {
|
|
78
|
+
(0, interface_api_util_1.assert)(subscription?.status !== CANCELLED_STATUS, HTTP_BAD_REQUEST, "saas.errors.workspace.is_cancelled");
|
|
79
|
+
}
|
|
76
80
|
async function upsertFreeSubscription(tenantId, planId, freeUntil, createdBy) {
|
|
77
81
|
const tenantSubscriptionModel = (0, interface_database_decorators_1.GetModel)(db_3.TenantSubscriptionModel, tenantId);
|
|
78
82
|
const existing = await tenantSubscriptionModel.findOne();
|
|
83
|
+
assertNotCancelled(existing);
|
|
79
84
|
const previousPlan = existing?.planId
|
|
80
85
|
? await (0, interface_database_decorators_1.GetModel)(db_3.PlanModel).get(existing.planId)
|
|
81
86
|
: undefined;
|
|
@@ -130,8 +135,9 @@ async function assertPlanIsAvailableForTenant(plan, tenantId) {
|
|
|
130
135
|
(0, interface_api_util_1.assert)(isCurrentPlan || (0, plan_audience_1.isPlanOpenToWorkspace)(plan, billingInfo?.customerType), HTTP_BAD_REQUEST, "saas.errors.plan.not_available_for_customer_type");
|
|
131
136
|
return plan;
|
|
132
137
|
}
|
|
133
|
-
async function
|
|
138
|
+
async function assertFreeAccessGrantable(tenantId, body) {
|
|
134
139
|
const subscription = await (0, interface_database_decorators_1.GetModel)(db_3.TenantSubscriptionModel, tenantId).findOne();
|
|
140
|
+
assertNotCancelled(subscription);
|
|
135
141
|
(0, interface_api_util_1.assert)(!subscription?.stripeSubscriptionId ||
|
|
136
142
|
body.acknowledgeCancellation === true, HTTP_BAD_REQUEST, "saas.errors.workspace.cancellation_not_acknowledged");
|
|
137
143
|
}
|
|
@@ -154,9 +160,9 @@ class SaasWorkspacesAdminController extends (0, interface_api_1.Controller)("/ap
|
|
|
154
160
|
}
|
|
155
161
|
async grantFreeAccess(user, tenantId, body) {
|
|
156
162
|
await this.assertTenantExists(tenantId);
|
|
163
|
+
await assertFreeAccessGrantable(tenantId, body);
|
|
157
164
|
const planId = (0, primitive_guards_1.isString)(body.planId) ? body.planId : "";
|
|
158
165
|
const plan = await assertPlanIsAvailableForTenant(planId ? await this.planModel.get(planId) : undefined, tenantId);
|
|
159
|
-
await assertCancellationAcknowledged(tenantId, body);
|
|
160
166
|
const freeUntil = (0, utils_1.parseFutureDate)(body.freeUntil, "saas.errors.workspace_create.free_until_past");
|
|
161
167
|
await (0, one_shot_1.runJournaled)({ tenantId, actor: { id: user._id, email: user.email }, details: {} }, {
|
|
162
168
|
action: "workspace.complimentary_grant",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces-admin.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/workspaces-admin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAyC;AACzC,6DAMmC;AACnC,uEAAwD;AACxD,6FAA4E;AAC5E,qDAA8E;AAC9E,iFAAyF;AACzF,iFAAkF;AAClF,yDAA+D;AAC/D,0DAAyE;AAEzE,0EAGmD;AACnD,uDAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"workspaces-admin.js","sourceRoot":"","sources":["../../../src/routes/platformOwner/workspaces-admin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SessionModel, type User, UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
2
2
|
import { PlanModel } from "../../db";
|
|
3
|
+
import type { RegistrationPaymentMethodPolicy } from "../../types";
|
|
3
4
|
import { type RequestHeaderValue } from "../../utils/content-language";
|
|
4
5
|
import { type PublicBillingRules, type PublicPlan } from "./public-plan-catalog";
|
|
5
6
|
import type { TenantPlanFeature } from "../../plans";
|
|
@@ -46,6 +47,7 @@ interface RegistrationPlanSummary {
|
|
|
46
47
|
requestedPlan: PublicPlan | null;
|
|
47
48
|
features: TenantPlanFeature[];
|
|
48
49
|
rules: PublicBillingRules;
|
|
50
|
+
paymentMethod: RegistrationPaymentMethodPolicy;
|
|
49
51
|
}
|
|
50
52
|
declare const SaasRegisterApiController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
51
53
|
export declare class SaasRegisterApiController extends SaasRegisterApiController_base {
|
|
@@ -162,6 +162,7 @@ class SaasRegisterApiController extends (0, interface_api_1.Controller)("/api/sa
|
|
|
162
162
|
requestedPlan: isAnotherPlan ? (byId.get(requested._id) ?? null) : null,
|
|
163
163
|
features: catalog.features,
|
|
164
164
|
rules,
|
|
165
|
+
paymentMethod: (0, config_1.getRegistrationPaymentMethodPolicy)(),
|
|
165
166
|
};
|
|
166
167
|
}
|
|
167
168
|
async createSetupIntent() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/routes/public/register.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA0C;AAC1C,6DAMmC;AACnC,uEAAwD;AACxD,gEAA6D;AAC7D,uEAAgE;AAChE,6FAA4E;AAC5E,qDAAiE;AACjE,yDAOwC;AACxC,0DAI2C;AAC3C,sEAA8E;AAC9E,qCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/routes/public/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { PlanInterval } from '../../composables/usePlanIntervalLabel'
|
|
2
2
|
import type { TenantPlanFeature } from '../../composables/useTenantPlan'
|
|
3
3
|
import { PLAN_UNLIMITED } from '../plan-catalog'
|
|
4
|
+
import type { RegistrationPaymentMethodPolicy } from '../../types/runtime-config'
|
|
4
5
|
|
|
5
6
|
export type PlanBillingMode = 'flat' | 'seat'
|
|
6
7
|
export type RefundMode = 'full' | 'prorated'
|
|
@@ -50,6 +51,8 @@ export interface RegistrationPlanSummary {
|
|
|
50
51
|
requestedPlan: PublicPlan | null
|
|
51
52
|
features: TenantPlanFeature[]
|
|
52
53
|
rules: PublicBillingRules
|
|
54
|
+
/** The card policy the backend applies to this registration. */
|
|
55
|
+
paymentMethod: RegistrationPaymentMethodPolicy
|
|
53
56
|
}
|
|
54
57
|
|
|
55
58
|
export interface SeatExample {
|
|
@@ -102,7 +102,8 @@ const menu = computed<DropdownMenuItem[][]>(() => {
|
|
|
102
102
|
? t(`${D}.grant_free_access`)
|
|
103
103
|
: t(`${D}.immediate_upgrade`),
|
|
104
104
|
icon: isBilled.value ? 'i-ph-gift' : 'i-ph-arrow-circle-up',
|
|
105
|
-
disabled:
|
|
105
|
+
disabled:
|
|
106
|
+
isCancelled.value || (!isBilled.value && !current?.stripeCustomerId),
|
|
106
107
|
onSelect: () => openDialog(isBilled.value ? 'complimentary' : 'upgrade'),
|
|
107
108
|
},
|
|
108
109
|
{
|
|
@@ -157,6 +158,7 @@ async function runRequestedAction(
|
|
|
157
158
|
if (!current || typeof requested !== 'string') return
|
|
158
159
|
const { [ACTION_QUERY]: _action, ...query } = route.query
|
|
159
160
|
await router.replace({ query })
|
|
161
|
+
if (current.status === 'cancelled') return
|
|
160
162
|
QUERY_ACTIONS[requested]?.()
|
|
161
163
|
}
|
|
162
164
|
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import type { RegistrationPlanSummary } from '../build/public/pricing'
|
|
2
|
+
|
|
3
|
+
type PaymentStepRule = (skipsPaymentMethod: boolean) => boolean
|
|
4
|
+
|
|
5
|
+
const DEFAULT_PAYMENT_POLICY: RegistrationPaymentMethodPolicy = 'required'
|
|
6
|
+
|
|
7
|
+
const PAYMENT_STEP_RULES: Record<
|
|
8
|
+
RegistrationPaymentMethodPolicy,
|
|
9
|
+
PaymentStepRule
|
|
10
|
+
> = {
|
|
11
|
+
required: () => true,
|
|
12
|
+
optional: (skipsPaymentMethod) => !skipsPaymentMethod,
|
|
13
|
+
none: () => false,
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* The card policy a sign-up screen follows: the one the backend applies, from
|
|
18
|
+
* the registration plan summary, once it has loaded. Until then, the policy
|
|
19
|
+
* the deployment published, falling back to the backend's own default. The
|
|
20
|
+
* published policy is the configured one: the frontend server cannot tell
|
|
21
|
+
* whether the backend holds a usable Stripe key.
|
|
22
|
+
*
|
|
23
|
+
* @param config dms-saas public runtime config
|
|
24
|
+
* @param summary The registration plan summary, once it has loaded
|
|
25
|
+
* @returns The applied policy, else the configured one, else `required`
|
|
26
|
+
*/
|
|
27
|
+
export function resolveRegistrationPaymentPolicy(
|
|
28
|
+
config: DmsSaasPublicRuntimeConfig | undefined,
|
|
29
|
+
summary?: Pick<RegistrationPlanSummary, 'paymentMethod'> | null,
|
|
30
|
+
): RegistrationPaymentMethodPolicy {
|
|
31
|
+
return (
|
|
32
|
+
[summary?.paymentMethod, config?.registrationPaymentMethod].find(
|
|
33
|
+
isPaymentPolicy,
|
|
34
|
+
) ?? DEFAULT_PAYMENT_POLICY
|
|
35
|
+
)
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function isPaymentPolicy(
|
|
39
|
+
policy: string | undefined,
|
|
40
|
+
): policy is RegistrationPaymentMethodPolicy {
|
|
41
|
+
return !!policy && policy in PAYMENT_STEP_RULES
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Whether the registration still collects a card.
|
|
46
|
+
*
|
|
47
|
+
* @param policy Configured card policy
|
|
48
|
+
* @param skipsPaymentMethod Whether the visitor chose to add a card later
|
|
49
|
+
* @returns True when the card step is shown and must be completed
|
|
50
|
+
*/
|
|
51
|
+
export function isPaymentStepShown(
|
|
52
|
+
policy: RegistrationPaymentMethodPolicy,
|
|
53
|
+
skipsPaymentMethod: boolean,
|
|
54
|
+
): boolean {
|
|
55
|
+
return PAYMENT_STEP_RULES[policy](skipsPaymentMethod)
|
|
56
|
+
}
|
|
@@ -8,6 +8,10 @@ import {
|
|
|
8
8
|
toValue,
|
|
9
9
|
} from 'vue'
|
|
10
10
|
import { REGISTER_PLAN_PARAM } from '../build/public/routes'
|
|
11
|
+
import {
|
|
12
|
+
isPaymentStepShown,
|
|
13
|
+
resolveRegistrationPaymentPolicy,
|
|
14
|
+
} from './registrationCardPolicy'
|
|
11
15
|
import {
|
|
12
16
|
registrationLandingPath,
|
|
13
17
|
useSaasRegistrationPlan,
|
|
@@ -108,12 +112,9 @@ interface SetupIntentResponse {
|
|
|
108
112
|
clientSecret: string | null
|
|
109
113
|
}
|
|
110
114
|
|
|
111
|
-
type PaymentStepRule = (skipsPaymentMethod: boolean) => boolean
|
|
112
|
-
|
|
113
115
|
const SETUP_INTENT_ENDPOINT = '/api/saas/register/setup-intent'
|
|
114
116
|
const REGISTER_ENDPOINT = '/api/saas/register'
|
|
115
117
|
const DEFAULT_PAYMENT_ELEMENT_ID = 'dms-saas-register-payment-element'
|
|
116
|
-
const DEFAULT_PAYMENT_POLICY: RegistrationPaymentMethodPolicy = 'required'
|
|
117
118
|
const INVITATION_ONLY = 'invitation-only'
|
|
118
119
|
const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
|
|
119
120
|
const DEFAULT_WORKSPACE_NAME_KEY = 'saas.public.register.default_workspace_name'
|
|
@@ -121,15 +122,6 @@ const NO_PAYMENT_ERROR_KEY = 'saas.public.register.error.card_required'
|
|
|
121
122
|
const SUBMIT_ERROR_KEY = 'saas.public.register.error.failed'
|
|
122
123
|
const PASSWORD_POLICY_ERROR_KEY = 'saas.errors.registration.password_policy'
|
|
123
124
|
|
|
124
|
-
const PAYMENT_STEP_RULES: Record<
|
|
125
|
-
RegistrationPaymentMethodPolicy,
|
|
126
|
-
PaymentStepRule
|
|
127
|
-
> = {
|
|
128
|
-
required: () => true,
|
|
129
|
-
optional: (skipsPaymentMethod) => !skipsPaymentMethod,
|
|
130
|
-
none: () => false,
|
|
131
|
-
}
|
|
132
|
-
|
|
133
125
|
/**
|
|
134
126
|
* Checked in the order the visitor can act on them: the card field comes
|
|
135
127
|
* before the legal checkbox on every screen.
|
|
@@ -215,36 +207,6 @@ export function registrationFieldOf(
|
|
|
215
207
|
return (errorKey && API_ERROR_FIELDS[errorKey]) || null
|
|
216
208
|
}
|
|
217
209
|
|
|
218
|
-
/**
|
|
219
|
-
* The card policy the deployment published, falling back to the backend's
|
|
220
|
-
* own default when it published none.
|
|
221
|
-
*
|
|
222
|
-
* @param config dms-saas public runtime config
|
|
223
|
-
* @returns The configured policy, or `required`
|
|
224
|
-
*/
|
|
225
|
-
export function resolveRegistrationPaymentPolicy(
|
|
226
|
-
config: DmsSaasPublicRuntimeConfig | undefined,
|
|
227
|
-
): RegistrationPaymentMethodPolicy {
|
|
228
|
-
const policy = config?.registrationPaymentMethod
|
|
229
|
-
return policy && policy in PAYMENT_STEP_RULES
|
|
230
|
-
? policy
|
|
231
|
-
: DEFAULT_PAYMENT_POLICY
|
|
232
|
-
}
|
|
233
|
-
|
|
234
|
-
/**
|
|
235
|
-
* Whether the registration still collects a card.
|
|
236
|
-
*
|
|
237
|
-
* @param policy Configured card policy
|
|
238
|
-
* @param skipsPaymentMethod Whether the visitor chose to add a card later
|
|
239
|
-
* @returns True when the card step is shown and must be completed
|
|
240
|
-
*/
|
|
241
|
-
export function isPaymentStepShown(
|
|
242
|
-
policy: RegistrationPaymentMethodPolicy,
|
|
243
|
-
skipsPaymentMethod: boolean,
|
|
244
|
-
): boolean {
|
|
245
|
-
return PAYMENT_STEP_RULES[policy](skipsPaymentMethod)
|
|
246
|
-
}
|
|
247
|
-
|
|
248
210
|
/**
|
|
249
211
|
* Whether the deployment has closed public registration to invitations.
|
|
250
212
|
*
|
|
@@ -336,13 +298,18 @@ export function useSaasRegistration(options: UseSaasRegistrationOptions = {}) {
|
|
|
336
298
|
|
|
337
299
|
/** Registration by invitation only: render the closed state, not the form. */
|
|
338
300
|
const isRegistrationClosed = isRegistrationClosedBy(saasConfig)
|
|
339
|
-
|
|
301
|
+
/** The policy the backend applies, once the plan summary has loaded. */
|
|
302
|
+
const paymentMethodPolicy = computed(() =>
|
|
303
|
+
resolveRegistrationPaymentPolicy(saasConfig, plan.summary.value),
|
|
304
|
+
)
|
|
340
305
|
/** Whether the screen should offer to add the card later. */
|
|
341
|
-
const canSkipPaymentMethod =
|
|
306
|
+
const canSkipPaymentMethod = computed(
|
|
307
|
+
() => paymentMethodPolicy.value === 'optional',
|
|
308
|
+
)
|
|
342
309
|
|
|
343
310
|
/** Bind the card field's visibility to this, with `v-show`, not `v-if`. */
|
|
344
311
|
const isPaymentStepVisible = computed(() =>
|
|
345
|
-
isPaymentStepShown(paymentMethodPolicy, form.skipsPaymentMethod),
|
|
312
|
+
isPaymentStepShown(paymentMethodPolicy.value, form.skipsPaymentMethod),
|
|
346
313
|
)
|
|
347
314
|
|
|
348
315
|
/**
|
|
@@ -542,8 +509,8 @@ export function useSaasRegistration(options: UseSaasRegistrationOptions = {}) {
|
|
|
542
509
|
isLoading.value = false
|
|
543
510
|
return
|
|
544
511
|
}
|
|
545
|
-
|
|
546
|
-
if (paymentMethodPolicy === 'none') {
|
|
512
|
+
await plan.load()
|
|
513
|
+
if (paymentMethodPolicy.value === 'none') {
|
|
547
514
|
isLoading.value = false
|
|
548
515
|
return
|
|
549
516
|
}
|
|
@@ -65,12 +65,14 @@ const saasConfig = config.public.dmsSaas as
|
|
|
65
65
|
| undefined
|
|
66
66
|
const dmsRuntime = config.public.dms as DmsPublicRuntime
|
|
67
67
|
const isRegistrationClosed = isRegistrationClosedBy(saasConfig)
|
|
68
|
-
const paymentMethodPolicy = resolveRegistrationPaymentPolicy(saasConfig)
|
|
69
68
|
const comparePlansTo = isPublicScreenServed(saasConfig, 'pricing')
|
|
70
69
|
? PRICING_PATH
|
|
71
70
|
: null
|
|
72
71
|
|
|
73
72
|
const plan = useSaasRegistrationPlan(readChosenPlan)
|
|
73
|
+
const paymentMethodPolicy = computed(() =>
|
|
74
|
+
resolveRegistrationPaymentPolicy(saasConfig, plan.summary.value),
|
|
75
|
+
)
|
|
74
76
|
|
|
75
77
|
const tenantAssignmentToken = computed(() => {
|
|
76
78
|
const value = route.query.token
|
|
@@ -95,7 +97,7 @@ const stripeHandle = ref<ReturnType<typeof useStripePaymentElement> | null>(
|
|
|
95
97
|
)
|
|
96
98
|
|
|
97
99
|
const isPaymentStepVisible = computed(() =>
|
|
98
|
-
isPaymentStepShown(paymentMethodPolicy, skipsPaymentMethod.value),
|
|
100
|
+
isPaymentStepShown(paymentMethodPolicy.value, skipsPaymentMethod.value),
|
|
99
101
|
)
|
|
100
102
|
|
|
101
103
|
const entryProvider = computed<OAuthProviderOption | null>(() => {
|
|
@@ -185,7 +187,7 @@ async function createSetupIntent(): Promise<string | undefined> {
|
|
|
185
187
|
|
|
186
188
|
async function mountPaymentElement(): Promise<void> {
|
|
187
189
|
const publishableKey = saasConfig?.stripePublishableKey
|
|
188
|
-
if (!publishableKey || paymentMethodPolicy === 'none') return
|
|
190
|
+
if (!publishableKey || paymentMethodPolicy.value === 'none') return
|
|
189
191
|
try {
|
|
190
192
|
const clientSecret = await createSetupIntent()
|
|
191
193
|
if (!clientSecret) return
|
|
@@ -280,7 +282,7 @@ onMounted(async () => {
|
|
|
280
282
|
// after a card has been entered.
|
|
281
283
|
await loadPendingRegistration()
|
|
282
284
|
if (entryFailure.value) return
|
|
283
|
-
|
|
285
|
+
await plan.load()
|
|
284
286
|
await mountPaymentElement()
|
|
285
287
|
})
|
|
286
288
|
</script>
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
"downgrade_exceeds_seat_limit": "This plan allows fewer members than the workspace currently has",
|
|
30
30
|
"inheritance_cycle": "Plan inheritance would create a cycle",
|
|
31
31
|
"inheritance_parent_missing": "Parent plan not found",
|
|
32
|
+
"invalid_billing_mode": "Plan billing mode must be Flat rate or Per seat",
|
|
32
33
|
"invalid_interval": "Plan billing interval must be monthly or yearly",
|
|
33
34
|
"no_stripe_price": "Plan has no Stripe price",
|
|
34
35
|
"seat_limit_reached": "The plan's member limit has been reached",
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
"downgrade_exceeds_seat_limit": "Cette offre autorise moins de membres que l'espace de travail n'en compte actuellement",
|
|
30
30
|
"inheritance_cycle": "L'héritage d'offres créerait un cycle",
|
|
31
31
|
"inheritance_parent_missing": "Offre parente introuvable",
|
|
32
|
+
"invalid_billing_mode": "Le mode de facturation de l'offre doit être Forfait ou Par siège",
|
|
32
33
|
"invalid_interval": "L'intervalle de facturation de l'offre doit être mensuel ou annuel",
|
|
33
34
|
"no_stripe_price": "L'offre n'a pas de tarif Stripe",
|
|
34
35
|
"seat_limit_reached": "La limite de membres de l'offre est atteinte",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-saas",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.1",
|
|
4
4
|
"description": "SaaS module for the AntelopeJS DMS: self-service sign-up and pricing, plans that gate features, Stripe billing, workspace settings and a back office.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antelopejs",
|
|
@@ -55,12 +55,13 @@
|
|
|
55
55
|
"node-cron": "^4.2.1",
|
|
56
56
|
"stripe": "^22.6.2",
|
|
57
57
|
"zod": "^3.24.4",
|
|
58
|
-
"@antelopejs/interface-dms-saas": "^0.7.
|
|
58
|
+
"@antelopejs/interface-dms-saas": "^0.7.1"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@antelopejs/core": "1.
|
|
62
|
-
"@antelopejs/dms": ">=0.
|
|
61
|
+
"@antelopejs/core": "1.21.0",
|
|
62
|
+
"@antelopejs/dms": ">=0.17.0 <1.0.0",
|
|
63
63
|
"@antelopejs/dms-frontend": ">=0.10.0 <1.0.0",
|
|
64
|
+
"@antelopejs/interface-mongodb": ">=0.0.6 <1.0.0",
|
|
64
65
|
"@antelopejs/mongodb": "1.6.2",
|
|
65
66
|
"@total-typescript/shoehorn": "^0.1.2",
|
|
66
67
|
"@types/node": "^24.0.0",
|
package/skills/dms-saas/SKILL.md
CHANGED
|
@@ -23,7 +23,9 @@ User docs: `docs/` of this package, published at https://dms.antelopejs.com/docs
|
|
|
23
23
|
`withStripeAvailability()` and, when it cannot work without Stripe, calls `assertStripeConfigured()` first
|
|
24
24
|
(`503 saas.errors.stripe.not_configured`) — see `src/stripe/availability.ts`.
|
|
25
25
|
- Stripe webhook endpoint → `/api/saas/webhooks/stripe`, API version `2026-08-26.dahlia`.
|
|
26
|
-
-
|
|
26
|
+
- Sign-up completion needs no frontend server env: the module declares `/api/saas/register/finalize` as an
|
|
27
|
+
`authEstablishEndpoints` entry of its frontend module. A `403` from `/auth/establish` (sign-ups stay signed out)
|
|
28
|
+
means the frontend server does not serve this module's frontend (`faq`).
|
|
27
29
|
- `allowedRedirectHosts` for Checkout / billing-portal return URLs: defaults to the DMS `clientBaseUrl` host, a value replaces it (loopback auto-allowed in dev only).
|
|
28
30
|
- A free plan must exist (or `defaultPlanSlug`): registration opens it, and every workspace without a subscription gets it.
|
|
29
31
|
- Options: `admissionMode` (`open` | `invitation-only`), `registration.paymentMethod` (`required` default | `optional` | `none`),
|