Merge branch 'main' into developer-plugin-terms

Author: simonhamp

app/Http/Controllers/GitHubIntegrationController.php

@@ -57,7 +57,7 @@ public function handleCallback(): RedirectResponse
                 'trace' => $e->getTraceAsString(),
             ]);
 
-            $route = Auth::check() ? 'customer.licenses' : 'customer.login';
+            $route = Auth::check() ? 'customer.licenses.list' : 'customer.login';
 
             return to_route($route)
                 ->with('error', 'GitHub authentication failed. Please try again.');

app/Livewire/LeadSubmissionForm.php

@@ -8,6 +8,7 @@
 use App\Rules\Turnstile;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\RateLimiter;
+use Livewire\Attributes\Locked;
 use Livewire\Component;
 
 class LeadSubmissionForm extends Component
@@ -24,6 +25,7 @@ class LeadSubmissionForm extends Component
 
     public string $turnstileToken = '';
 
+    #[Locked]
     public bool $submitted = false;
 
     protected function rules(): array

app/Livewire/OrderSuccess.php

@@ -59,7 +59,14 @@ public function loadData(): void
             return;
         }
 
-        $this->subscription = Subscription::fromStripePriceId($subscriptionItem->stripe_price);
+        try {
+            $this->subscription = Subscription::fromStripePriceId($subscriptionItem->stripe_price);
+        } catch (\RuntimeException $e) {
+            report($e);
+
+            return;
+        }
+
         $this->email = $subscriptionRecord->user->email;
         $this->licenseKey = License::query()
             ->whereBelongsTo($subscriptionItem)

app/Livewire/VersionSwitcher.php

@@ -3,16 +3,20 @@
 namespace App\Livewire;
 
 use Illuminate\View\ViewException;
+use Livewire\Attributes\Locked;
 use Livewire\Component;
 
 class VersionSwitcher extends Component
 {
+    #[Locked]
     public string $platform;
 
+    #[Locked]
     public array $versions;
 
     public int $version;
 
+    #[Locked]
     public string $page;
 
     public function mount(array $versions)

app/Models/Plugin.php

@@ -47,9 +47,12 @@ public static function findByVendorPackageOrFail(string $vendor, string $package
      */
     public function routeParams(): array
     {
-        [$vendor, $package] = explode('/', $this->name);
+        $parts = explode('/', $this->name ?? '');
 
-        return ['vendor' => $vendor, 'package' => $package];
+        return [
+            'vendor' => $parts[0] ?? '',
+            'package' => $parts[1] ?? '',
+        ];
     }
 
     protected $guarded = [];

app/Providers/HorizonServiceProvider.php

@@ -28,7 +28,7 @@ public function boot(): void
     protected function gate(): void
     {
         Gate::define('viewHorizon', function ($user = null) {
-            return $user->isAdmin();
+            return $user?->isAdmin() ?? false;
         });
     }
 }

app/Services/PluginSyncService.php

@@ -65,7 +65,18 @@ public function sync(Plugin $plugin): bool
 
         if ($composerData) {
             if (isset($composerData['name']) && ! $plugin->name) {
-                $updateData['name'] = $composerData['name'];
+                $existing = Plugin::where('name', $composerData['name'])
+                    ->where('id', '!=', $plugin->id)
+                    ->exists();
+
+                if (! $existing) {
+                    $updateData['name'] = $composerData['name'];
+                } else {
+                    Log::warning('[PluginSync] Plugin name already taken', [
+                        'plugin_id' => $plugin->id,
+                        'name' => $composerData['name'],
+                    ]);
+                }
             }
 
             if (isset($composerData['description'])) {

app/Services/SatisService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Enums\PluginType;
 use App\Models\Plugin;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
@@ -25,7 +26,7 @@ public function buildAll(?string $githubToken = null): array
     {
         $plugins = $this->getApprovedPlugins();
 
-        return $this->triggerBuild($plugins, $githubToken);
+        return $this->triggerBuild($plugins, $githubToken, fullBuild: true);
     }
 
     /**
@@ -107,6 +108,7 @@ protected function getApprovedPlugins(): array
     {
         return Plugin::query()
             ->approved()
+            ->where('type', PluginType::Paid)
             ->get()
             ->map(fn (Plugin $plugin) => [
                 'name' => $plugin->name,
@@ -120,7 +122,7 @@ protected function getApprovedPlugins(): array
     /**
      * @param  array<int, array{name: string, repository_url: string, type: string, is_official?: bool}>  $plugins
      */
-    protected function triggerBuild(array $plugins, ?string $githubToken = null): array
+    protected function triggerBuild(array $plugins, ?string $githubToken = null, bool $fullBuild = false): array
     {
         if (! $this->apiUrl || ! $this->apiKey) {
             return [
@@ -139,7 +141,10 @@ protected function triggerBuild(array $plugins, ?string $githubToken = null): ar
         $githubToken ??= config('services.github.token');
 
         try {
-            $payload = ['plugins' => $plugins];
+            $payload = [
+                'plugins' => $plugins,
+                'full_build' => $fullBuild,
+            ];
 
             if ($githubToken) {
                 $payload['github_token'] = $githubToken;

routes/web.php

@@ -221,11 +221,19 @@
         }
     }
 
-    return to_route('docs.show', [
-        'platform' => $platform,
-        'version' => $version,
-        'page' => $page,
-    ]);
+    try {
+        return to_route('docs.show', [
+            'platform' => $platform,
+            'version' => $version,
+            'page' => $page,
+        ]);
+    } catch (\Illuminate\Routing\Exceptions\UrlGenerationException) {
+        return to_route('docs.show', [
+            'platform' => $platform,
+            'version' => $version,
+            'page' => 'introduction',
+        ]);
+    }
 })->name('docs')->where('page', '.*');
 
 Route::get('order/{checkoutSessionId}', App\Livewire\OrderSuccess::class)->name('order.success');

tests/Feature/SatisSync/SatisSyncTest.php

@@ -9,6 +9,7 @@
 use App\Services\SatisService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Http;
 use Livewire\Livewire;
 use Tests\TestCase;
 
@@ -124,4 +125,29 @@ public function test_is_satis_synced_returns_true_when_synced(): void
 
         $this->assertTrue($plugin->isSatisSynced());
     }
+
+    public function test_build_all_only_includes_paid_plugins(): void
+    {
+        Http::fake(['*' => Http::response(['job_id' => 'test-123', 'message' => 'Build started'], 200)]);
+
+        config(['services.satis.url' => 'https://satis.test', 'services.satis.api_key' => 'test-key']);
+
+        $paidPlugin = Plugin::factory()->paid()->approved()->create();
+        Plugin::factory()->free()->approved()->create();
+
+        $service = new SatisService;
+        $result = $service->buildAll();
+
+        $this->assertTrue($result['success']);
+        $this->assertEquals(1, $result['plugins_count']);
+
+        Http::assertSent(function ($request) use ($paidPlugin) {
+            $data = $request->data();
+            $plugins = $data['plugins'] ?? [];
+
+            return count($plugins) === 1
+                && $plugins[0]['name'] === $paidPlugin->name
+                && $data['full_build'] === true;
+        });
+    }
 }