Beautiful Open-Source Form Builder
Flush cache on subscription changes
Julien Nahum57c695e97695
diff --git a/app/Models/Billing/Subscription.php b/app/Models/Billing/Subscription.phpnew file mode 100644index 000000000..e20d61339--- /dev/null+++ b/app/Models/Billing/Subscription.php@@ -0,0 +1,21 @@+<?php++namespace App\Models\Billing;++use Illuminate\Database\Eloquent\Factories\HasFactory;+use Laravel\Cashier\Subscription as CashierSubscription;++class Subscription extends CashierSubscription+{+ use HasFactory;++ public static function booted(): void+ {+ static::saved(function (Subscription $sub) {+ $sub->user->flushCache();+ });+ static::deleted(function (Subscription $sub) {+ $sub->user->flushCache();+ });+ }+}diff --git a/app/Models/License.php b/app/Models/License.phpindex 51027378c..c0e55dc92 100644--- a/app/Models/License.php+++ b/app/Models/License.php@@ -51,4 +51,18 @@ class License extends Model3 => null,][$this->meta['tier']];}++ public static function booted(): void+ {+ static::saved(function (License $license) {+ if ($license->user) {+ $license->user->flushCache();+ }+ });+ static::deleted(function (License $license) {+ if ($license->user) {+ $license->user->flushCache();+ }+ });+ }}diff --git a/app/Models/User.php b/app/Models/User.phpindex a7c3127de..492aa1b6f 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -2,9 +2,7 @@namespace App\Models;-use App\Http\Controllers\SubscriptionController;use App\Models\Forms\Form;-use App\Models\Template;use App\Notifications\ResetPassword;use App\Notifications\VerifyEmail;use Illuminate\Database\Eloquent\Factories\HasFactory;@@ -61,7 +59,12 @@ class User extends Authenticatable implements JWTSubjectpublic function ownsForm(Form $form){- return $this->workspaces()->find($form->workspace_id) !== null;+ return $this->workspaces()->whereUserId($form->workspace_id)->exists();+ }++ public function ownsWorkspace(Workspace $workspace)+ {+ return $this->workspaces()->whereUserId($workspace->id)->exists();}/**@@ -203,6 +206,16 @@ class User extends Authenticatable implements JWTSubject})->first()?->onTrial();}+ public function flushCache()+ {+ $this->workspaces()->with('forms')->get()->each(function (Workspace $workspace) {+ $workspace->flush();+ $workspace->forms->each(function (Form $form) {+ $form->flush();+ });+ });+ }+public static function boot(){parent::boot();diff --git a/app/Policies/FormPolicy.php b/app/Policies/FormPolicy.phpindex 5a06b39a0..359d32498 100644--- a/app/Policies/FormPolicy.php+++ b/app/Policies/FormPolicy.php@@ -30,7 +30,7 @@ class FormPolicy*/public function view(User $user, Form $form){- return $user->workspaces()->find($form->workspace_id) !== null;+ return $user->ownsForm($form);}/**@@ -53,7 +53,7 @@ class FormPolicy*/public function update(User $user, Form $form){- return $user->workspaces()->find($form->workspace_id) !== null;+ return $user->ownsForm($form);}/**@@ -65,7 +65,7 @@ class FormPolicy*/public function delete(User $user, Form $form){- return $user->workspaces()->find($form->workspace_id) !== null;+ return $user->ownsForm($form);}/**@@ -77,7 +77,7 @@ class FormPolicy*/public function restore(User $user, Form $form){- return $user->workspaces()->find($form->workspace_id) !== null;+ return $user->ownsForm($form);}/**@@ -89,6 +89,6 @@ class FormPolicy*/public function forceDelete(User $user, Form $form){- return $user->workspaces()->find($form->workspace_id) !== null;+ return $user->ownsForm($form);}}diff --git a/app/Policies/WorkspacePolicy.php b/app/Policies/WorkspacePolicy.phpindex 4a237d823..23b6f1369 100644--- a/app/Policies/WorkspacePolicy.php+++ b/app/Policies/WorkspacePolicy.php@@ -30,7 +30,7 @@ class WorkspacePolicy*/public function view(User $user, Workspace $workspace){- return $workspace->users()->find($user->id)!==null;+ return $user->ownsWorkspace($workspace);}/**diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex dd0a30f1a..3fa5d1adb 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -2,6 +2,7 @@namespace App\Providers;+use App\Models\Billing\Subscription;use Illuminate\Http\Resources\Json\JsonResource;use Illuminate\Support\Facades\Schema;use Illuminate\Support\ServiceProvider;@@ -31,6 +32,7 @@ class AppServiceProvider extends ServiceProviderJsonResource::withoutWrapping();Cashier::calculateTaxes();+ Cashier::useSubscriptionModel(Subscription::class);if ($this->app->runningUnitTests()) {Schema::defaultStringLength(191);