Refactor social authentication routes and methods for consistency

Author: Irvan789

app/Http/Controllers/SocialProvider.php

@@ -15,25 +15,18 @@
 
 class SocialProvider extends Controller
 {
-    public mixed $user;
+    private ?User $user;
 
     public function __construct()
     {
         $this->user = Auth::user();
     }
 
-    public function google(Request $request): RedirectResponse
+    public function redirect(Request $request, string $provider): RedirectResponse
     {
-        $this->createSession($request, 'google');
+        $this->createSession($request);
 
-        return Socialite::driver('google')->redirect();
-    }
-
-    public function github(Request $request): RedirectResponse
-    {
-        $this->createSession($request, 'github');
-
-        return Socialite::driver('github')->redirect();
+        return Socialite::driver($provider)->redirect();
     }
 
     public function callback(string $provider): RedirectResponse
@@ -56,15 +49,15 @@ public function callback(string $provider): RedirectResponse
                     return $this->redirectBack();
                 }
 
-                $socialAccountByEmail = Social::getUserBySocialAccoutEmail($provider, $socialite->email);
+                $socialAccountByEmail = Social::getUserBySocialAccountEmail($provider, $socialite->email);
 
                 if ($socialAccountByEmail->first()) {
                     throw new Exception('Can\'t unlink social account with different email address.');
                 }
 
-                $socialAccontsByUserId = Social::getUserBySocialUserId($provider, $this->user->id);
+                $socialAccountsByUserId = Social::getUserBySocialUserId($provider, $this->user->id);
 
-                if ($socialAccontsByUserId->first()) {
+                if ($socialAccountsByUserId->first()) {
                     throw new Exception('Can\'t unlink social account with different email address.');
                 }
 
@@ -82,7 +75,7 @@ public function callback(string $provider): RedirectResponse
                 return $this->redirectBack();
             }
 
-            $loginUsingSocialAccount = Social::getUserBySocialAccountsId($provider, $socialite->id)->first();
+            $loginUsingSocialAccount = Social::getUserBySocialAccountId($provider, $socialite->id)->first();
 
             if ($loginUsingSocialAccount) {
                 $user = User::where('id', $loginUsingSocialAccount->user_id)->first();
@@ -178,10 +171,10 @@ private function redirectBack(): RedirectResponse
             return Redirect::to($intended);
         }
 
-        $socialite = Session::get('url.socialite');
+        $socialiteUrl = Session::get('url.socialite');
 
-        if ($socialite) {
-            return Redirect::to($socialite);
+        if ($socialiteUrl) {
+            return Redirect::to($socialiteUrl);
         }
 
         return Redirect::route('profile');

app/Models/Social.php

@@ -23,7 +23,7 @@ protected function getUserBySocialAccountId(Builder $query, string $provider, st
     }
 
     #[Scope]
-    protected function getUserBySocialAccoutEmail(Builder $query, string $provider, string $email): void
+    protected function getUserBySocialAccountEmail(Builder $query, string $provider, string $email): void
     {
         $query->where([
             'provider' => $provider,

resources/views/livewire/auth/login.blade.php

@@ -71,7 +71,7 @@ class="text-[0.9375rem]/4 text-[#8b7355] hover:underline"
   <x-separator />
 
   <div class="mb-0.5 flex flex-col gap-2">
-    <x-social-link :href="route('socials.google')">
+    <x-social-link :href="route('socials.redirect', ['provider' => 'google'])">
       <img
         src="{{ asset('assets/icon/google.svg') }}"
         class="size-4"
@@ -80,7 +80,7 @@ class="size-4"
       Continue with Google
     </x-social-link>
 
-    <x-social-link :href="route('socials.github')">
+    <x-social-link :href="route('socials.redirect', ['provider' => 'github'])">
       <img
         src="{{ asset('assets/icon/github.svg') }}"
         class="size-4"

resources/views/livewire/profile.blade.php

@@ -114,15 +114,15 @@ class="xs:max-w-30 ml-auto w-full text-xs/3"
       @else
         <x-social-account
           name="Google"
-          :url="route('socials.google')"
+          :url="route('socials.redirect', ['provider' => 'google'])"
           email="{{ $socials_google ? $socials_google->email : 'Not Linked' }}"
         >
           {{ $socials_google ? 'Unlink' : 'Link' }}
         </x-social-account>
 
         <x-social-account
           name="GitHub"
-          :url="route('socials.github')"
+          :url="route('socials.redirect', ['provider' => 'github'])"
           email="{{ $socials_github ? $socials_github->email : 'Not Linked' }}"
         >
           {{ $socials_github ? 'Unlink' : 'Link' }}

routes/web.php

@@ -46,8 +46,9 @@
 Route::controller(SocialProvider::class)
     ->prefix('/socials')
     ->group(function () {
-        Route::get('/google', 'google')->name('socials.google');
-        Route::get('/github', 'github')->name('socials.github');
+        Route::get('/{provider}', 'redirect')
+            ->name('socials.redirect')
+            ->whereIn('provider', ['google', 'github']);
 
         Route::get('/{provider}/callback', 'callback');
     });