fix: #78 fix subscription middleware logic

ptah-sh · Aug 4, 2024 · 53645d9 · 53645d9
1 parent 486434f
commit 53645d9
Show file tree

Hide file tree

Showing 6 changed files with 429 additions and 133 deletions.
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
@@ -48,6 +48,8 @@ protected function createTeam(User $user): void
             'user_id' => $user->id,
             'name' => explode(' ', $user->name, 2)[0]."'s Team",
             'personal_team' => true,
+            'billing_email' => $user->email,
+            'billing_name' => $user->name,
         ]));
     }
 }
diff --git a/app/Http/Middleware/EnsureTeamSubscription.php b/app/Http/Middleware/EnsureTeamSubscription.php
@@ -15,15 +15,11 @@ class EnsureTeamSubscription
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (auth()->guest()) {
-            return $next($request);
-        }
-
         $team = auth()->user()->currentTeam;
         $subscription = $team->subscription();
 
         $doesntHaveSubscription = $subscription === null || ! $subscription->onTrial() && ! $subscription->active();
-        if ($doesntHaveSubscription && ! $request->routeIs('teams.billing.show')) {
+        if ($doesntHaveSubscription) {
             return redirect()->route('teams.billing.show', $team);
         }
 

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -3,7 +3,6 @@
 use ApiNodes\Http\Middleware\AgentTokenAuth;
 use App\Console\Commands\DispatchProcessBackupTask;
 use App\Console\Commands\DispatchVolumeBackupTask;
-use App\Http\Middleware\EnsureTeamSubscription;
 use App\Http\Middleware\HandleInertiaRequests;
 use App\Jobs\CheckAgentUpdates;
 use App\Models\Service;
@@ -32,12 +31,10 @@
         $middleware
             ->api(prepend: [
                 AgentTokenAuth::class,
-                EnsureTeamSubscription::class,
             ])
             ->web(append: [
                 HandleInertiaRequests::class,
                 AddLinkHeadersForPreloadedAssets::class,
-                EnsureTeamSubscription::class,
             ])
             ->alias([
                 'abilities' => CheckAbilities::class,