Detect current status

Author: simonhamp

app/Livewire/GitHubAccessBanner.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Support\GitHubOAuth;
+use Illuminate\Support\Facades\Cache;
+use Livewire\Component;
+
+class GitHubAccessBanner extends Component
+{
+    public bool $inline = false;
+
+    public ?string $collaboratorStatus = null;
+
+    public function mount(bool $inline = false): void
+    {
+        $this->inline = $inline;
+        $this->checkCollaboratorStatus();
+    }
+
+    public function checkCollaboratorStatus(): void
+    {
+        $user = auth()->user();
+
+        if (! $user || ! $user->github_username) {
+            $this->collaboratorStatus = null;
+
+            return;
+        }
+
+        // Cache the status for 5 minutes to avoid excessive API calls
+        $cacheKey = "github_collab_status_{$user->id}";
+
+        $this->collaboratorStatus = Cache::remember($cacheKey, 300, function () use ($user) {
+            $github = GitHubOAuth::make();
+
+            return $github->checkCollaboratorStatus($user->github_username);
+        });
+
+        // If they have active access but we haven't recorded it, update our record
+        if ($this->collaboratorStatus === 'active' && ! $user->mobile_repo_access_granted_at) {
+            $user->update(['mobile_repo_access_granted_at' => now()]);
+        }
+    }
+
+    public function refreshStatus(): void
+    {
+        $user = auth()->user();
+
+        if ($user) {
+            Cache::forget("github_collab_status_{$user->id}");
+        }
+
+        $this->checkCollaboratorStatus();
+    }
+
+    public function render()
+    {
+        return view('livewire.git-hub-access-banner');
+    }
+}

resources/views/customer/licenses/index.blade.php

@@ -27,7 +27,7 @@
             <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
                 <x-discounts-banner :inline="true" />
                 <livewire:wall-of-love-banner :inline="true" />
-                <x-github-access-banner :inline="true" />
+                <livewire:git-hub-access-banner :inline="true" />
             </div>
         </div>
 

…omponents/github-access-banner.blade.php …livewire/git-hub-access-banner.blade.phpresources/views/components/github-access-banner.blade.php renamed to resources/views/livewire/git-hub-access-banner.blade.php resources/views/components/github-access-banner.blade.php renamed to resources/views/livewire/git-hub-access-banner.blade.php

@@ -1,5 +1,4 @@
-@props(['inline' => false])
-
+<div>
 @if(auth()->user()->hasActiveMaxLicense())
     <div @class(['max-w-7xl mx-auto px-4 sm:px-6 lg:px-8' => !$inline])>
         <div class="bg-gradient-to-r from-gray-50 to-slate-100 dark:from-gray-800 dark:to-slate-900 border border-gray-300 dark:border-gray-600 rounded-lg p-6 h-full">
@@ -11,18 +10,26 @@
                 </div>
                 <div class="ml-4 flex-1">
                     <h3 class="font-medium text-gray-900 dark:text-white">
-                        GitHub Repository Access
+                        <a href="https://github.com/nativephp/mobile" target="_blank" rel="noopener noreferrer" class="hover:underline"><code>nativephp/mobile</code></a> Repo Access
                     </h3>
                     <div class="mt-1 text-sm text-gray-600 dark:text-gray-400">
                         @if(auth()->user()->github_username)
                             <p>Connected as <span class="font-mono font-medium text-gray-900 dark:text-white">{{ '@' . auth()->user()->github_username }}</span></p>
-                            @if(auth()->user()->mobile_repo_access_granted_at)
+
+                            @if($collaboratorStatus === 'active')
                                 <p class="mt-1">
                                     <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200">
-                                        Invitation Sent
+                                        Access Granted
                                     </span>
                                 </p>
-                                <p class="mt-1 text-xs">Check your GitHub notifications to accept.</p>
+                                <p class="mt-1 text-xs">You have access to the nativephp/mobile repository.</p>
+                            @elseif($collaboratorStatus === 'pending')
+                                <p class="mt-1">
+                                    <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200">
+                                        Invitation Pending
+                                    </span>
+                                </p>
+                                <p class="mt-1 text-xs">Check your GitHub notifications to accept the invitation.</p>
                             @else
                                 <p>Request access to the nativephp/mobile repository.</p>
                             @endif
@@ -32,7 +39,16 @@
                     </div>
                     <div class="mt-4 flex flex-wrap gap-2">
                         @if(auth()->user()->github_username)
-                            @if(!auth()->user()->mobile_repo_access_granted_at)
+                            @if($collaboratorStatus === 'active')
+                                <a href="https://github.com/nativephp/mobile" target="_blank" rel="noopener noreferrer" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                                    View Repo
+                                </a>
+                            @elseif($collaboratorStatus === 'pending')
+                                <button wire:click="refreshStatus" type="button" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                                    <span wire:loading.remove wire:target="refreshStatus">Check Status</span>
+                                    <span wire:loading wire:target="refreshStatus">Checking...</span>
+                                </button>
+                            @else
                                 <form action="{{ route('github.request-access') }}" method="POST">
                                     @csrf
                                     <button type="submit" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
@@ -58,3 +74,4 @@
         </div>
     </div>
 @endif
+</div>

tests/Feature/GitHubIntegrationTest.php

@@ -6,6 +6,7 @@
 use App\Models\License;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Laravel\Pennant\Feature;
 use Tests\TestCase;
@@ -19,10 +20,15 @@ protected function setUp(): void
         parent::setUp();
 
         Feature::define(ShowAuthButtons::class, true);
+
+        // Clear cache between tests to avoid stale collaborator status
+        Cache::flush();
     }
 
     public function test_user_with_active_max_license_sees_github_integration_card(): void
     {
+        Http::fake(['api.github.com/*' => Http::response([], 404)]);
+
         $user = User::factory()->create();
         License::factory()->create([
             'user_id' => $user->id,
@@ -34,12 +40,15 @@ public function test_user_with_active_max_license_sees_github_integration_card()
         $response = $this->actingAs($user)->get('/customer/licenses');
 
         $response->assertStatus(200);
-        $response->assertSee('GitHub Repository Access');
+        $response->assertSee('nativephp/mobile');
+        $response->assertSee('Repo Access');
         $response->assertSee('Connect GitHub');
     }
 
     public function test_user_without_max_license_does_not_see_github_integration_card(): void
     {
+        Http::fake(['api.github.com/*' => Http::response([], 404)]);
+
         $user = User::factory()->create();
         License::factory()->create([
             'user_id' => $user->id,
@@ -51,11 +60,13 @@ public function test_user_without_max_license_does_not_see_github_integration_ca
         $response = $this->actingAs($user)->get('/customer/licenses');
 
         $response->assertStatus(200);
-        $response->assertDontSee('GitHub Repository Access');
+        $response->assertDontSee('Repo Access');
     }
 
     public function test_user_with_connected_github_sees_username(): void
     {
+        Http::fake(['api.github.com/*' => Http::response([], 404)]);
+
         $user = User::factory()->create([
             'github_username' => 'testuser',
             'github_id' => '123456',
@@ -78,7 +89,7 @@ public function test_user_with_connected_github_sees_username(): void
     public function test_user_can_request_repo_access_with_active_max_license(): void
     {
         Http::fake([
-            'api.github.com/repos/nativephp/mobile/collaborators/*' => Http::response([], 201),
+            'api.github.com/repos/nativephp/mobile/collaborators/testuser' => Http::response([], 201),
         ]);
 
         $user = User::factory()->create([
@@ -146,7 +157,7 @@ public function test_user_cannot_request_repo_access_without_connected_github():
     public function test_user_can_disconnect_github_account(): void
     {
         Http::fake([
-            'api.github.com/repos/nativephp/mobile/collaborators/*' => Http::response([], 204),
+            'api.github.com/repos/nativephp/mobile/collaborators/testuser' => Http::response([], 204),
         ]);
 
         $user = User::factory()->create([
@@ -178,7 +189,7 @@ public function test_user_can_disconnect_github_account(): void
     public function test_scheduled_command_removes_access_for_expired_max_license(): void
     {
         Http::fake([
-            'api.github.com/repos/nativephp/mobile/collaborators/*' => Http::response([], 204),
+            'api.github.com/repos/nativephp/mobile/collaborators/testuser' => Http::response([], 204),
         ]);
 
         $user = User::factory()->create([
@@ -226,12 +237,15 @@ public function test_scheduled_command_does_not_remove_access_for_active_max_lic
         ]);
     }
 
-    public function test_user_with_granted_access_sees_access_status(): void
+    public function test_user_with_active_collaborator_status_sees_access_granted(): void
     {
+        Http::fake([
+            'api.github.com/repos/nativephp/mobile/collaborators/testuser' => Http::response([], 204),
+        ]);
+
         $user = User::factory()->create([
             'github_username' => 'testuser',
             'github_id' => '123456',
-            'mobile_repo_access_granted_at' => now()->subHours(2),
         ]);
         License::factory()->create([
             'user_id' => $user->id,
@@ -243,8 +257,37 @@ public function test_user_with_granted_access_sees_access_status(): void
         $response = $this->actingAs($user)->get('/customer/licenses');
 
         $response->assertStatus(200);
-        $response->assertSee('Invitation Sent');
+        $response->assertSee('Access Granted');
         $response->assertSee('@testuser');
+        $response->assertSee('View Repo');
         $response->assertDontSee('Request Access');
     }
+
+    public function test_user_with_pending_invitation_sees_pending_status(): void
+    {
+        Http::fake([
+            'api.github.com/repos/nativephp/mobile/collaborators/testuser' => Http::response([], 404),
+            'api.github.com/repos/nativephp/mobile/invitations' => Http::response([
+                ['invitee' => ['login' => 'testuser']],
+            ], 200),
+        ]);
+
+        $user = User::factory()->create([
+            'github_username' => 'testuser',
+            'github_id' => '123456',
+        ]);
+        License::factory()->create([
+            'user_id' => $user->id,
+            'policy_name' => 'max',
+            'expires_at' => now()->addDays(30),
+            'is_suspended' => false,
+        ]);
+
+        $response = $this->actingAs($user)->get('/customer/licenses');
+
+        $response->assertStatus(200);
+        $response->assertSee('Invitation Pending');
+        $response->assertSee('@testuser');
+        $response->assertSee('Check Status');
+    }
 }