From 0f4153dc23bf808c89457af778f79a1187cdd9b0 Mon Sep 17 00:00:00 2001 From: Paul Fitzpatrick Date: Tue, 8 Feb 2022 13:40:48 -0500 Subject: [PATCH] (core) stop applying product limits to grist-core Summary: Limits crafted for our SaaS product were getting applied to grist-core users. This diff removes them. There will be limits on a future self-managed product. Test Plan: checked manually Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D3255 --- README.md | 1 + app/gen-server/entity/Product.ts | 9 +++++---- stubs/app/server/server.ts | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 79416769..a96f12fb 100644 --- a/README.md +++ b/README.md @@ -176,6 +176,7 @@ GRIST_APP_ROOT | directory containing Grist sandbox and assets (specificall GRIST_BACKUP_DELAY_SECS | wait this long after a doc change before making a backup GRIST_DATA_DIR | directory in which to store document caches. GRIST_DEFAULT_EMAIL | if set, login as this user if no other credentials presented +GRIST_DEFAULT_PRODUCT | if set, this controls enabled features and limits of new sites. See names of PRODUCTS in Product.ts. GRIST_DOMAIN | in hosted Grist, Grist is served from subdomains of this domain. Defaults to "getgrist.com". GRIST_EXPERIMENTAL_PLUGINS | enables experimental plugins GRIST_HOME_INCLUDE_STATIC | if set, home server also serves static resources diff --git a/app/gen-server/entity/Product.ts b/app/gen-server/entity/Product.ts index b8ab5a92..f86c35e2 100644 --- a/app/gen-server/entity/Product.ts +++ b/app/gen-server/entity/Product.ts @@ -126,12 +126,13 @@ const PRODUCTS: IProduct[] = [ * Get names of products for different situations. */ export function getDefaultProductNames() { + const defaultProduct = process.env.GRIST_DEFAULT_PRODUCT; return { - personal: 'starter', // Personal site start off on a functional plan. - teamInitial: 'stub', // Team site starts off on a limited plan, requiring subscription. + personal: defaultProduct || 'starter', // Personal site start off on a functional plan. + teamInitial: defaultProduct || 'stub', // Team site starts off on a limited plan, requiring subscription. teamCancel: 'suspended', // Team site that has been 'turned off'. - team: 'team', // Functional team site. - teamFree: 'teamFree', + team: defaultProduct || 'team', // Functional team site. + teamFree: defaultProduct || 'teamFree', }; } diff --git a/stubs/app/server/server.ts b/stubs/app/server/server.ts index 039f5f70..85afe3e7 100644 --- a/stubs/app/server/server.ts +++ b/stubs/app/server/server.ts @@ -20,6 +20,7 @@ setDefaultEnv('GRIST_SESSION_COOKIE', 'grist_core2'); setDefaultEnv('GRIST_SERVE_SAME_ORIGIN', 'true'); setDefaultEnv('GRIST_SINGLE_PORT', 'true'); +setDefaultEnv('GRIST_DEFAULT_PRODUCT', 'Free'); import {updateDb} from 'app/server/lib/dbUtils'; import {main as mergedServerMain} from 'app/server/mergedServerMain';