wip

Author: driesvints

app/Http/Controllers/Auth/GitHubController.php

@@ -44,23 +44,23 @@ public function handleProviderCallback(ConnectGitHubAccount $connectGitHubAccoun
         }
 
         $isConnectingAttempt = session()->pull('settings.github.connect.intended', false);
-        
+
         if ($isConnectingAttempt) {
             $currentUser = auth()->user();
-            $githubId = $socialiteUser->getId();
 
-            // Check if the GitHub account is already connected to another user
-            $existingUser = User::where('github_id', $githubId)->where('id', '!=', $currentUser->id)->first();
+            // Check if the GitHub account is already connected to another user.
+            $existingUser = User::where('github_id', $socialiteUser->getId())
+                ->where('id', '!=', $currentUser->id)
+                ->first();
+            
             if ($existingUser) {
                 $this->error('This GitHub account is already connected to another user.');
+            } else {
+                $connectGitHubAccount($currentUser, $socialiteUser);
 
-                return redirect(route('settings.profile'));
+                $this->success('Your GitHub account has been connected.');
             }
 
-            $connectGitHubAccount($currentUser, $socialiteUser);
-
-            $this->success('Your GitHub account has been connected.');
-
             return redirect(route('settings.profile'));
         }
 

resources/views/users/settings/github.blade.php

@@ -48,14 +48,14 @@
             @endif
         </div>
 
-        @if (!Auth::user()->hasConnectedGitHubAccount())
+        @unless (Auth::user()->hasConnectedGitHubAccount())
             <x-forms.form id="github_settings_form" method="POST" action="{{ route('settings.github.connect') }}">
                 <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
                     <x-buttons.primary-button type="submit">
                         Connect GitHub
                     </x-buttons.primary-button>
                 </div>
             </x-forms.form>
-        @endif
+        @endunless
     </div>
 </section>