Beautiful Open-Source Form Builder
Remove SELF_HOSTED configuration from environment files and update pricing_enabled logic
Julien Nahuma24ddf91c589
diff --git a/api/.env.docker b/api/.env.dockerindex c83145b7a..c4eb2b19c 100644--- a/api/.env.docker+++ b/api/.env.docker@@ -4,8 +4,6 @@ APP_KEY=APP_DEBUG=falseAPP_URL=http://localhost-SELF_HOSTED=true-LOG_CHANNEL=errorlogLOG_LEVEL=debugdiff --git a/api/.env.example b/api/.env.exampleindex 488f51015..089b737f7 100644--- a/api/.env.example+++ b/api/.env.example@@ -5,8 +5,6 @@ APP_DEBUG=trueAPP_LOG_LEVEL=debugAPP_URL=http://localhost-SELF_HOSTED=true-LOG_CHANNEL=stackLOG_LEVEL=debugdiff --git a/api/app/Models/User.php b/api/app/Models/User.phpindex 90815507f..0be9d8dd2 100644--- a/api/app/Models/User.php+++ b/api/app/Models/User.php@@ -146,6 +146,10 @@ class User extends Authenticatable implements JWTSubject, CachableAttributespublic function getIsSubscribedAttribute(){+ if (!pricing_enabled()) {+ return true;+ }+return $this->remember('is_subscribed', 5 * 60, function (): bool {return $this->subscribed()|| in_array($this->email, config('opnform.extra_pro_users_emails'))diff --git a/api/app/helpers.php b/api/app/helpers.phpindex 5890076ff..61820a317 100644--- a/api/app/helpers.php+++ b/api/app/helpers.php@@ -15,6 +15,6 @@ if (!function_exists('front_url')) {if (!function_exists('pricing_enabled')) {function pricing_enabled(): bool{- return !is_null(config('cashier.key'));+ return !is_null(config('cashier.key')) && !config('app.self_hosted');}}diff --git a/docker-compose.dev.yml b/docker-compose.dev.ymlindex 75a9c84a2..08aaf46af 100644--- a/docker-compose.dev.yml+++ b/docker-compose.dev.yml@@ -17,8 +17,6 @@ services:FRONT_URL: http://localhost:3000APP_KEY: base64:dD8AFEB45nKZ0VWmIPiW495rDYb+ywRJnCCSdycw0pI=JWT_SECRET: 38hjE96gYu4ceKSSHNnzgeynMr2m3WkNBN2u7zzpVeiITtxFEloxAjcr7TCKuiiy- # Self-hosted configuration- SELF_HOSTED: "true"# Database settingsDB_HOST: dbDB_DATABASE: ${DB_DATABASE:-forge}