fix(socialite): adding dusk ids back, and fixing some actions

Author: BennettPhil

.github/workflows/tests.yml

@@ -51,6 +51,14 @@ jobs:
       - name: Generate Application Key
         run: php artisan key:generate
 
+        # Install the Chrome binaries required for Dusk to run tests
+      - name: Install Chrome binaries
+        run: php artisan dusk:chrome-driver --detect
+
+      # Start the Chrome driver so we're able to run browser tests with Chrome
+      - name: Start Chrome Driver
+        run: ./vendor/laravel/dusk/bin/chromedriver-linux &
+
       - name: Run Migrations
         run: php artisan migrate
 

app/Http/Controllers/Auth/SocialitePlusController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
 use App\Models\User;
-use Blaspsoft\SocialitePlus\SocialitePlusFactory;
 use Illuminate\Http\Request;
+use Blaspsoft\SocialitePlus\SocialitePlusFactory;
 use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
 
 class SocialitePlusController extends Controller
 {
@@ -19,6 +19,8 @@ class SocialitePlusController extends Controller
 
     /**
      * Create a new SocialLoginController instance.
+     *
+     * @param SocialitePlusFactory $socialitePlus
      */
     public function __construct(SocialitePlusFactory $socialitePlus)
     {
@@ -28,6 +30,7 @@ public function __construct(SocialitePlusFactory $socialitePlus)
     /**
      * Redirect to the social login page
      *
+     * @param string $provider
      * @return \Illuminate\Http\RedirectResponse
      */
     public function redirect(string $provider)
@@ -44,21 +47,20 @@ public function redirect(string $provider)
     /**
      * Handle the social login callback
      *
+     * @param string $provider
+     * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function callback(string $provider, Request $request)
     {
-        if (! $request->has('code')) {
-            return redirect()->route('login')->with('error', 'Invalid request');
-        }
+        if (!$request->has('code')) return redirect()->route('login')->with('error', 'Invalid request');
 
         $user = $this->socialitePlus->build($provider)->user();
 
         $existingUser = User::where('email', $user->getEmail())->first();
 
         if ($existingUser) {
             Auth::login($existingUser);
-
             return redirect()->intended('/dashboard');
         }
 

resources/js/components/socialite-plus.tsx

@@ -57,6 +57,7 @@ export default function SocialitePlus({ providersConfig }: SocialitePlusProps) {
                         <Button
                             key={provider.name}
                             type="button"
+                            dusk={`${provider.name}-login-button`}
                             variant="outline"
                             className={getProviderClasses(provider)}
                             tabIndex={5}