Fix method names for consistency in Social model

Author: Irvan789

app/Http/Controllers/SocialProvider.php

@@ -36,7 +36,7 @@ public function github(Request $request): RedirectResponse
         return Socialite::driver('github')->redirect();
     }
 
-    public function callback(string $provider, Request $request): RedirectResponse
+    public function callback(string $provider): RedirectResponse
     {
         try {
             $socialite = Socialite::driver($provider)->user();
@@ -46,26 +46,26 @@ public function callback(string $provider, Request $request): RedirectResponse
                     throw new Exception('Please create password first before you can manage linking social accounts.');
                 }
 
-                $socialAccontsById = Social::getUserBySocialAccountsId($provider, $socialite->id);
+                $socialAccountById = Social::getUserBySocialAccountId($provider, $socialite->id);
 
-                if ($socialAccontsById->first()) {
-                    $socialAccontsById->delete();
+                if ($socialAccountById->first()) {
+                    $socialAccountById->delete();
 
                     Session::regenerate();
 
                     return $this->redirectBack();
                 }
 
-                $socialAccountByEmail = Social::getUserBySocialAccoutsEmail($provider, $socialite->email)->first();
+                $socialAccountByEmail = Social::getUserBySocialAccoutEmail($provider, $socialite->email);
 
-                if ($socialAccountByEmail) {
-                    throw new Exception('Error while processing your request');
+                if ($socialAccountByEmail->first()) {
+                    throw new Exception('Can\'t unlink social account with different email address');
                 }
 
-                $socialAccontsByUserId = Social::getUserBySocialUserId($provider, $this->user->id)->first();
+                $socialAccontsByUserId = Social::getUserBySocialUserId($provider, $this->user->id);
 
-                if ($socialAccontsByUserId) {
-                    throw new Exception('Error while processing your request');
+                if ($socialAccontsByUserId->first()) {
+                    throw new Exception('Can\'t unlink social account with different email address');
                 }
 
                 $socialData = [

app/Models/Social.php

@@ -14,7 +14,7 @@ class Social extends Model
     use HasUuids;
 
     #[Scope]
-    protected function getUserBySocialAccountsId(Builder $query, string $provider, string $id): void
+    protected function getUserBySocialAccountId(Builder $query, string $provider, string $id): void
     {
         $query->where([
             'provider' => $provider,
@@ -23,7 +23,7 @@ protected function getUserBySocialAccountsId(Builder $query, string $provider, s
     }
 
     #[Scope]
-    protected function getUserBySocialAccoutsEmail(Builder $query, string $provider, string $email): void
+    protected function getUserBySocialAccoutEmail(Builder $query, string $provider, string $email): void
     {
         $query->where([
             'provider' => $provider,