Adding fixes to show error message for user

thedevdojo · Jun 30, 2024 · 9242580 · 9242580
1 parent 29f9316
commit 9242580
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 60 deletions.
diff --git a/public/build/assets/styles.css b/public/build/assets/styles.css
diff --git a/resources/views/components/elements/session-message.blade.php b/resources/views/components/elements/session-message.blade.php
@@ -0,0 +1,26 @@
+<!-- resources/views/components/auth/elements/session-message.blade.php -->
+@php
+$messageTypes = ['error', 'warning', 'success', 'info'];
+$message = null;
+$type = null;
+
+foreach ($messageTypes as $messageType) {
+    if (session()->has($messageType)) {
+        $message = session($messageType);
+        $type = $messageType;
+        break;
+    }
+}
+@endphp
+
+@if($message)
+    <div @class([
+        'mb-6 p-4 text-sm rounded-lg',
+        'bg-red-100 text-red-700' => $type == 'error',
+        'bg-orange-100 text-orange-700' => $type == 'warning',
+        'bg-green-100 text-green-700' => $type == 'success',
+        'bg-blue-100 text-blue-700' => $type == 'info',
+    ]) role="alert">
+        {{ $message }}
+    </div>
+@endif
diff --git a/resources/views/pages/auth/login.blade.php b/resources/views/pages/auth/login.blade.php
@@ -130,6 +130,8 @@ public function authenticate()
                         :description="($language->login->subheadline ?? 'No Description')"
                         :show_subheadline="($language->login->show_subheadline ?? false)" />
 
+                    <x-auth::elements.session-message />
+
                     @if(config('devdojo.auth.settings.login_show_social_providers') && config('devdojo.auth.settings.social_providers_location') == 'top')
                         <x-auth::elements.social-providers />
                     @endif

diff --git a/resources/views/pages/auth/register.blade.php b/resources/views/pages/auth/register.blade.php
@@ -123,6 +123,7 @@ public function register()
     <x-auth::elements.container>
 
         <x-auth::elements.heading :text="($language->register->headline ?? 'No Heading')" :description="($language->register->subheadline ?? 'No Description')" :show_subheadline="($language->register->show_subheadline ?? false)" />
+        <x-auth::elements.session-message />
 
         @if(config('devdojo.auth.settings.social_providers_location') == 'top')
         <x-auth::elements.social-providers />

diff --git a/src/Http/Controllers/SocialController.php b/src/Http/Controllers/SocialController.php
@@ -23,64 +23,6 @@ public function redirect(Request $request, string $driver): RedirectResponse
         return Socialite::driver($driver)->redirect();
     }
 
-    public function callback(Request $request, $driver)
-    {
-        $this->dynamicallySetSocialProviderCredentials($driver);
-
-        $socialiteUser = Socialite::driver($driver)->user();
-
-        DB::transaction(function () use ($socialiteUser, $driver) {
-            // Attempt to find the user based on the social provider's ID and slug
-            $socialProviderUser = SocialProviderUser::where('provider_slug', $driver)
-                ->where('provider_user_id', $socialiteUser->getId())
-                ->first();
-
-            if ($socialProviderUser) {
-                // Log the user in and redirect to the home page
-                Auth::login($socialProviderUser->user);
-
-                return redirect()->to(config('devdojo.auth.settings.redirect_after_auth'));
-            }
-
-            // Check if the email from the social provider already exists in the User table
-            $user = User::where('email', $socialiteUser->getEmail())->first();
-
-            if ($user) {
-                // Inform the user that an account with this email already exists
-                throw new \Exception('An account with the provided email already exists. Please log in.');
-            }
-
-            // No user exists, register a new user
-            $newUser = User::create([
-                'name' => $socialiteUser->getName(),
-                'email' => $socialiteUser->getEmail(),
-                // Add other fields as necessary
-            ]);
-
-            $newUser->email_verified_at = now();
-            $newUser->save();
-
-            // Now add the social provider info for this new user
-            $newUser->addOrUpdateSocialProviderUser($driver, [
-                'provider_user_id' => $socialiteUser->getId(),
-                'nickname' => $socialiteUser->getNickname(),
-                'name' => $socialiteUser->getName(),
-                'email' => $socialiteUser->getEmail(),
-                'avatar' => $socialiteUser->getAvatar(),
-                'provider_data' => json_encode($socialiteUser->user),
-                'token' => $socialiteUser->token,
-                'refresh_token' => $socialiteUser->refreshToken,
-                'token_expires_at' => now()->addSeconds($socialiteUser->expiresIn),
-            ]);
-
-            // Log in the newly created user
-            Auth::login($newUser);
-        });
-
-        // Redirect to a specific page after successful registration and login
-        return redirect()->to(config('devdojo.auth.settings.redirect_after_auth')); // Adjust according to your needs
-    }
-
     private function dynamicallySetSocialProviderCredentials($provider)
     {
         $socialProvider = $this->getProviderCredentialsWithOverrides($provider);
@@ -102,4 +44,75 @@ private function getProviderCredentialsWithOverrides($provider)
 
         return $socialProvider;
     }
+
+    public function callback(Request $request, $driver)
+    {
+        $this->dynamicallySetSocialProviderCredentials($driver);
+
+        try {
+            $socialiteUser = Socialite::driver($driver)->user();
+            $providerUser = $this->findOrCreateProviderUser($socialiteUser, $driver);
+
+            if ($providerUser instanceof RedirectResponse) {
+                return $providerUser; // This is an error redirect
+            }
+
+            Auth::login($providerUser->user);
+
+            return redirect()->to(config('devdojo.auth.settings.redirect_after_auth'));
+        } catch (\Exception $e) {
+            return redirect()->route('auth.login')->with('error', 'An error occurred during authentication. Please try again.');
+        }
+    }
+
+    private function findOrCreateProviderUser($socialiteUser, $driver)
+    {
+        $providerUser = SocialProviderUser::where('provider_slug', $driver)
+            ->where('provider_user_id', $socialiteUser->getId())
+            ->first();
+
+        if ($providerUser) {
+            return $providerUser;
+        }
+
+        $user = User::where('email', $socialiteUser->getEmail())->first();
+
+        if ($user) {
+            $existingProvider = $user->socialProviders()->first();
+            if ($existingProvider) {
+                return redirect()->route('auth.login')->with('error', 
+                    "This email is already associated with a {$existingProvider->provider_slug} account. Please login using that provider.");
+            }
+        }
+
+        return DB::transaction(function () use ($socialiteUser, $driver, $user) {
+            $user = $user ?? $this->createUser($socialiteUser);
+            return $this->createSocialProviderUser($user, $socialiteUser, $driver);
+        });
+    }
+
+    private function createUser($socialiteUser)
+    {
+        return User::create([
+            'name' => $socialiteUser->getName(),
+            'email' => $socialiteUser->getEmail(),
+            'email_verified_at' => now(),
+        ]);
+    }
+
+    private function createSocialProviderUser($user, $socialiteUser, $driver)
+    {
+        return $user->socialProviders()->create([
+            'provider_slug' => $driver,
+            'provider_user_id' => $socialiteUser->getId(),
+            'nickname' => $socialiteUser->getNickname(),
+            'name' => $socialiteUser->getName(),
+            'email' => $socialiteUser->getEmail(),
+            'avatar' => $socialiteUser->getAvatar(),
+            'provider_data' => json_encode($socialiteUser->user),
+            'token' => $socialiteUser->token,
+            'refresh_token' => $socialiteUser->refreshToken,
+            'token_expires_at' => $socialiteUser->expiresIn ? now()->addSeconds($socialiteUser->expiresIn) : null,
+        ]);
+    }
 }
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -5,7 +5,8 @@ import forms from '@tailwindcss/forms';
 export default {
     content: [
         'resources/views/**/*.blade.php',
-        '../../resources/views/components/auth/**/*.blade.php'
+        '../../resources/views/components/auth/**/*.blade.php',
+        'resources/views/components/**/*.blade.php'
     ],
 
     theme: {},