From 6c4367fc5be33e3058a9a8efb3ba606ec51e799d Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Thu, 26 Oct 2023 18:14:56 +0100
Subject: [PATCH 1/8] wip

---
 .../views/components/input-error.blade.php    |   2 +-
 .../Blade/AuthenticateOAuthCallback.php       | 181 ---------------
 .../Auth/Breeze/HandleOAuthCallbackErrors.php |  29 ---
 .../Livewire/AuthenticateOAuthCallback.php    | 211 ------------------
 .../Filament/AuthenticateOAuthCallback.php    |  46 ----
 .../Filament/HandleOAuthCallbackErrors.php    |  30 ---
 .../Jetstream/HandleOAuthCallbackErrors.php   |  31 ---
 .../AuthenticateOAuthCallback.php             |  60 +++--
 src/Actions/GenerateRedirectForProvider.php   |   5 +
 src/Actions/HandleOAuthCallbackErrors.php     |  68 ++++++
 .../Drivers/Jetstream/JetstreamDriver.php     |   2 +-
 src/SocialstreamServiceProvider.php           |  29 +--
 tests/JetstreamTestCase.php                   |   4 +-
 13 files changed, 123 insertions(+), 575 deletions(-)
 delete mode 100644 src/Actions/Auth/Breeze/Blade/AuthenticateOAuthCallback.php
 delete mode 100644 src/Actions/Auth/Breeze/HandleOAuthCallbackErrors.php
 delete mode 100644 src/Actions/Auth/Breeze/Livewire/AuthenticateOAuthCallback.php
 delete mode 100644 src/Actions/Auth/Filament/AuthenticateOAuthCallback.php
 delete mode 100644 src/Actions/Auth/Filament/HandleOAuthCallbackErrors.php
 delete mode 100644 src/Actions/Auth/Jetstream/HandleOAuthCallbackErrors.php
 rename src/Actions/{Auth/Jetstream => }/AuthenticateOAuthCallback.php (74%)
 create mode 100644 src/Actions/HandleOAuthCallbackErrors.php

diff --git a/resources/filament/views/components/input-error.blade.php b/resources/filament/views/components/input-error.blade.php
index ad95f6b5..3c44bf17 100644
--- a/resources/filament/views/components/input-error.blade.php
+++ b/resources/filament/views/components/input-error.blade.php
@@ -1,7 +1,7 @@
 @props(['messages'])
 
 @if ($messages)
-    <ul {{ $attributes->merge(['class' => 'text-sm text-red-600 dark:text-red-400 space-y-1']) }}>
+    <ul {{ $attributes->merge(['class' => 'text-sm text-danger-600 dark:text-danger-400 space-y-1']) }}>
         @foreach ((array) $messages as $message)
             <li>{{ $message }}</li>
         @endforeach
diff --git a/src/Actions/Auth/Breeze/Blade/AuthenticateOAuthCallback.php b/src/Actions/Auth/Breeze/Blade/AuthenticateOAuthCallback.php
deleted file mode 100644
index aa662a72..00000000
--- a/src/Actions/Auth/Breeze/Blade/AuthenticateOAuthCallback.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Breeze\Blade;
-
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
-use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\ConnectedAccount;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
-use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
-use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
-use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
-use JoelButcher\Socialstream\Features;
-use JoelButcher\Socialstream\Providers;
-use JoelButcher\Socialstream\Socialstream;
-use Laravel\Socialite\Contracts\User as ProviderUser;
-
-class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
-{
-    /**
-     * Create a new controller instance.
-     */
-    public function __construct(
-        protected Guard $guard,
-        protected CreatesUserFromProvider $createsUser,
-        protected CreatesConnectedAccounts $createsConnectedAccounts,
-        protected UpdatesConnectedAccounts $updatesConnectedAccounts
-    ) {
-        //
-    }
-
-    public function authenticate(string $provider, ProviderUser $providerAccount): Response|RedirectResponse
-    {
-        $account = Socialstream::findConnectedAccountForProviderAndId($provider, $providerAccount->getId());
-
-        // Authenticated...
-        if (! is_null($user = auth()->user())) {
-            return $this->alreadyAuthenticated($user, $account, $provider, $providerAccount);
-        }
-
-        // Registration...
-        $previousUrl = session()->get('socialstream.previous_url');
-
-        if (
-            $previousUrl === route('register') ||
-            (Features::hasCreateAccountOnFirstLoginFeatures() && $previousUrl === route('login'))
-        ) {
-            $user = Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->first();
-
-            if ($user) {
-                return $this->alreadyRegistered($user, $account, $provider, $providerAccount);
-            }
-
-            return $this->register($provider, $providerAccount);
-        }
-
-        if (! Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with this :Provider sign in was not found. Please register or try a different sign in method.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('login')->withErrors(
-                $messageBag
-            );
-        }
-
-        if (Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-                $messageBag = new MessageBag;
-                $messageBag->add(
-                    'socialstream',
-                    __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-                );
-
-                return redirect()->route('login')->withErrors(
-                    $messageBag
-                );
-            }
-
-            $user = $this->createsUser->create($provider, $providerAccount);
-
-            return $this->login($user);
-        }
-
-        $user = $account->user;
-
-        $this->updatesConnectedAccounts->update($user, $account, $provider, $providerAccount);
-
-        return $this->login($user);
-    }
-
-    /**
-     * Handle connection of accounts for an already authenticated user.
-     */
-    protected function alreadyAuthenticated(Authenticatable $user, ?ConnectedAccount $account, string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        // Connect the account to the user.
-        if (! $account) {
-            $this->createsConnectedAccounts->create($user, $provider, $providerAccount);
-
-            return redirect()->route('profile.edit')->with(
-                'status', __('You have successfully connected :Provider to your account.', ['provider' => Providers::name($provider)])
-            );
-        }
-
-        if ($account->user_id !== $user->id) {
-            return redirect()->route('profile.edit')->withErrors(
-                ['callback' => __('This :Provider sign in account is already associated with another user. Please log in with that user or connect a different :Provider account.', ['provider' => Providers::name($provider)])]
-            );
-        }
-
-        // Account already connected
-        return redirect()->route('profile.edit')->withErrors(
-            ['callback' => __('This :Provider sign in account is already associated with your user.', ['provider' => Providers::name($provider)])]
-        );
-    }
-
-    /**
-     * Handle when a user is already registered.
-     */
-    protected function alreadyRegistered(Authenticatable $user, ?ConnectedAccount $account, string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        if (Features::hasLoginOnRegistrationFeatures()) {
-            // The user exists, but they're not registered with the given provider.
-            if (! $account) {
-                $this->createsConnectedAccounts->create($user, $provider, $providerAccount);
-            }
-
-            return $this->login($user);
-        }
-
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', __('An account with that :Provider sign in already exists, please login.', ['provider' => Providers::name($provider)]));
-
-        return redirect()->route('login')->withErrors($messageBag);
-    }
-
-    /**
-     * Handle the registration of a new user.
-     */
-    protected function register(string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        if (! $providerAccount->getEmail()) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('No email address is associated with this :Provider account. Please try a different account.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('register')->withErrors($messageBag);
-        }
-
-        if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('register')->withErrors($messageBag);
-        }
-
-        $user = $this->createsUser->create($provider, $providerAccount);
-
-        return $this->login($user);
-    }
-
-    /**
-     * Authenticate the given user and return a login response.
-     */
-    protected function login(Authenticatable $user): RedirectResponse
-    {
-        $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
-
-        return redirect('/dashboard');
-    }
-}
diff --git a/src/Actions/Auth/Breeze/HandleOAuthCallbackErrors.php b/src/Actions/Auth/Breeze/HandleOAuthCallbackErrors.php
deleted file mode 100644
index 57b5e48a..00000000
--- a/src/Actions/Auth/Breeze/HandleOAuthCallbackErrors.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Breeze;
-
-use App\Providers\RouteServiceProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
-
-class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
-{
-    /**
-     * Handles the request if the "errors" key is present.
-     */
-    public function handle(Request $request): ?RedirectResponse
-    {
-        if (! $request->has('error')) {
-            return null;
-        }
-
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', $request->get('error_description'));
-
-        return auth()->check()
-            ? redirect(RouteServiceProvider::HOME)->withErrors(['callback' => $request->get('error_description')])
-            : redirect()->route('login')->withErrors($messageBag);
-    }
-}
diff --git a/src/Actions/Auth/Breeze/Livewire/AuthenticateOAuthCallback.php b/src/Actions/Auth/Breeze/Livewire/AuthenticateOAuthCallback.php
deleted file mode 100644
index dfde8f34..00000000
--- a/src/Actions/Auth/Breeze/Livewire/AuthenticateOAuthCallback.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Breeze\Livewire;
-
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
-use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\ConnectedAccount;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
-use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
-use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
-use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
-use JoelButcher\Socialstream\Features;
-use JoelButcher\Socialstream\Providers;
-use JoelButcher\Socialstream\Socialstream;
-use Laravel\Socialite\Contracts\User as ProviderUser;
-
-class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
-{
-    /**
-     * Create a new controller instance.
-     */
-    public function __construct(
-        protected Guard $guard,
-        protected CreatesUserFromProvider $createsUser,
-        protected CreatesConnectedAccounts $createsConnectedAccounts,
-        protected UpdatesConnectedAccounts $updatesConnectedAccounts
-    ) {
-        //
-    }
-
-    public function authenticate(string $provider, ProviderUser $providerAccount): Response|RedirectResponse
-    {
-        $account = Socialstream::findConnectedAccountForProviderAndId($provider, $providerAccount->getId());
-
-        // Authenticated...
-        if (! is_null($user = auth()->user())) {
-            return $this->alreadyAuthenticated($user, $account, $provider, $providerAccount);
-        }
-
-        // Registration...
-        $previousUrl = session()->get('socialstream.previous_url');
-
-        if (
-            $previousUrl === route('register') ||
-            (Features::hasCreateAccountOnFirstLoginFeatures() && $previousUrl === route('login'))
-        ) {
-            $user = Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->first();
-
-            if ($user) {
-                return $this->alreadyRegistered($user, $account, $provider, $providerAccount);
-            }
-
-            return $this->register($provider, $providerAccount);
-        }
-
-        if (! Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with this :Provider sign in was not found. Please register or try a different sign in method.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('login')->withErrors(
-                $messageBag
-            );
-        }
-
-        if (Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-                $messageBag = new MessageBag;
-                $messageBag->add(
-                    'socialstream',
-                    __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-                );
-
-                return redirect()->route('login')->withErrors(
-                    $messageBag
-                );
-            }
-
-            $user = $this->createsUser->create($provider, $providerAccount);
-
-            return $this->login($user);
-        }
-
-        if (! Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with this :Provider sign in was not found. Please register or try a different sign in method.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('login')->withErrors(
-                $messageBag
-            );
-        }
-
-        if (Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-                $messageBag = new MessageBag;
-                $messageBag->add(
-                    'socialstream',
-                    __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-                );
-
-                return redirect()->route('login')->withErrors(
-                    $messageBag
-                );
-            }
-
-            $user = $this->createsUser->create($provider, $providerAccount);
-
-            return $this->login($user);
-        }
-
-        $user = $account->user;
-
-        $this->updatesConnectedAccounts->update($user, $account, $provider, $providerAccount);
-
-        return $this->login($user);
-    }
-
-    /**
-     * Handle connection of accounts for an already authenticated user.
-     */
-    protected function alreadyAuthenticated(Authenticatable $user, ?ConnectedAccount $account, string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        // Connect the account to the user.
-        if (! $account) {
-            $this->createsConnectedAccounts->create($user, $provider, $providerAccount);
-
-            return redirect()->route('profile')->with(
-                'status', __('You have successfully connected :Provider to your account.', ['provider' => Providers::name($provider)])
-            );
-        }
-
-        if ($account->user_id !== $user->id) {
-            return redirect()->route('profile')->withErrors(
-                ['callback' => __('This :Provider sign in account is already associated with another user. Please log in with that user or connect a different :Provider account.', ['provider' => Providers::name($provider)])]
-            );
-        }
-
-        // Account already connected
-        return redirect()->route('profile')->withErrors(
-            ['callback' => __('This :Provider sign in account is already associated with your user.', ['provider' => Providers::name($provider)])]
-        );
-    }
-
-    /**
-     * Handle when a user is already registered.
-     */
-    protected function alreadyRegistered(Authenticatable $user, ?ConnectedAccount $account, string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        if (Features::hasLoginOnRegistrationFeatures()) {
-            // The user exists, but they're not registered with the given provider.
-            if (! $account) {
-                $this->createsConnectedAccounts->create($user, $provider, $providerAccount);
-            }
-
-            return $this->login($user);
-        }
-
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', __('An account with that :Provider sign in already exists, please login.', ['provider' => Providers::name($provider)]));
-
-        return redirect()->route('login')->withErrors($messageBag);
-    }
-
-    /**
-     * Handle the registration of a new user.
-     */
-    protected function register(string $provider, ProviderUser $providerAccount): RedirectResponse
-    {
-        if (! $providerAccount->getEmail()) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('No email address is associated with this :Provider account. Please try a different account.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('register')->withErrors($messageBag);
-        }
-
-        if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('register')->withErrors($messageBag);
-        }
-
-        $user = $this->createsUser->create($provider, $providerAccount);
-
-        return $this->login($user);
-    }
-
-    /**
-     * Authenticate the given user and return a login response.
-     */
-    protected function login(Authenticatable $user): RedirectResponse
-    {
-        $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
-
-        return redirect('/dashboard');
-    }
-}
diff --git a/src/Actions/Auth/Filament/AuthenticateOAuthCallback.php b/src/Actions/Auth/Filament/AuthenticateOAuthCallback.php
deleted file mode 100644
index 62502fbc..00000000
--- a/src/Actions/Auth/Filament/AuthenticateOAuthCallback.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Filament;
-
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
-use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
-use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
-use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
-use JoelButcher\Socialstream\Socialstream;
-use Laravel\Socialite\Contracts\User as ProviderUser;
-
-class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
-{
-    /**
-     * Create a new controller instance.
-     */
-    public function __construct(
-        protected Guard $guard,
-        protected CreatesUserFromProvider $createsUser,
-        protected CreatesConnectedAccounts $createsConnectedAccounts,
-        protected UpdatesConnectedAccounts $updatesConnectedAccounts
-    ) {
-        //
-    }
-
-    public function authenticate(string $provider, ProviderUser $providerAccount): Response|RedirectResponse
-    {
-        $user = auth()->user();
-
-        if (! $user) {
-            $user = Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->first()
-                ?? $this->createsUser->create($provider, $providerAccount);
-        }
-
-        ($account = Socialstream::findConnectedAccountForProviderAndId($provider, $providerAccount->getId()))
-            ? $this->updatesConnectedAccounts->update($user, $account, $provider, $providerAccount)
-            : $this->createsConnectedAccounts->create($user, $provider, $providerAccount);
-
-        $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
-
-        return redirect()->route('filament.admin.home');
-    }
-}
diff --git a/src/Actions/Auth/Filament/HandleOAuthCallbackErrors.php b/src/Actions/Auth/Filament/HandleOAuthCallbackErrors.php
deleted file mode 100644
index dbd0b0db..00000000
--- a/src/Actions/Auth/Filament/HandleOAuthCallbackErrors.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Filament;
-
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
-
-class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
-{
-    /**
-     * Handles the request if the "errors" key is present.
-     */
-    public function handle(Request $request): ?RedirectResponse
-    {
-        if (! $request->has('error')) {
-            return null;
-        }
-
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', $request->get('error_description'));
-
-        return auth()->check()
-            ? redirect()->route('filament.home')->withErrors($messageBag)
-            : redirect()->route(
-                'filament.admin.auth.login'
-            )->withErrors($messageBag);
-    }
-}
diff --git a/src/Actions/Auth/Jetstream/HandleOAuthCallbackErrors.php b/src/Actions/Auth/Jetstream/HandleOAuthCallbackErrors.php
deleted file mode 100644
index ced7455f..00000000
--- a/src/Actions/Auth/Jetstream/HandleOAuthCallbackErrors.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace JoelButcher\Socialstream\Actions\Auth\Jetstream;
-
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
-use Laravel\Fortify\Features as FortifyFeatures;
-
-class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
-{
-    /**
-     * Handles the request if the "errors" key is present.
-     */
-    public function handle(Request $request): ?RedirectResponse
-    {
-        if (! $request->has('error')) {
-            return null;
-        }
-
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', $request->get('error_description'));
-
-        return auth()->check()
-            ? redirect(config('fortify.home'))->dangerBanner($request->get('error_description'))
-            : redirect()->route(
-                FortifyFeatures::enabled(FortifyFeatures::registration()) ? 'register' : 'login'
-            )->withErrors($messageBag);
-    }
-}
diff --git a/src/Actions/Auth/Jetstream/AuthenticateOAuthCallback.php b/src/Actions/AuthenticateOAuthCallback.php
similarity index 74%
rename from src/Actions/Auth/Jetstream/AuthenticateOAuthCallback.php
rename to src/Actions/AuthenticateOAuthCallback.php
index 0c964c42..25d64f0a 100644
--- a/src/Actions/Auth/Jetstream/AuthenticateOAuthCallback.php
+++ b/src/Actions/AuthenticateOAuthCallback.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace JoelButcher\Socialstream\Actions\Auth\Jetstream;
+namespace JoelButcher\Socialstream\Actions;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\MessageBag;
+use JoelButcher\Socialstream\Concerns\InteractsWithComposer;
 use JoelButcher\Socialstream\ConnectedAccount;
 use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
@@ -21,6 +23,8 @@
 
 class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
 {
+    use InteractsWithComposer;
+
     /**
      * Create a new controller instance.
      */
@@ -46,6 +50,7 @@ public function authenticate(string $provider, ProviderUser $providerAccount): R
         $previousUrl = session()->get('socialstream.previous_url');
 
         if (
+            class_exists(FortifyFeatures::class) &&
             FortifyFeatures::enabled(FortifyFeatures::registration()) && ! $account &&
             (
                 $previousUrl === route('register') ||
@@ -62,27 +67,15 @@ public function authenticate(string $provider, ProviderUser $providerAccount): R
         }
 
         if (! Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
-            $messageBag = new MessageBag;
-            $messageBag->add(
-                'socialstream',
-                __('An account with this :Provider sign in was not found. Please register or try a different sign in method.', ['provider' => Providers::name($provider)])
-            );
-
-            return redirect()->route('login')->withErrors(
-                $messageBag
+            return $this->redirectAuthFailed(
+                error: __('An account with this :Provider sign in was not found. Please register or try a different sign in method.', ['provider' => Providers::name($provider)])
             );
         }
 
         if (Features::hasCreateAccountOnFirstLoginFeatures() && ! $account) {
             if (Socialstream::newUserModel()->where('email', $providerAccount->getEmail())->exists()) {
-                $messageBag = new MessageBag;
-                $messageBag->add(
-                    'socialstream',
-                    __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
-                );
-
-                return redirect()->route('login')->withErrors(
-                    $messageBag
+                return $this->redirectAuthFailed(
+                    error: __('An account with that email address already exists. Please login to connect your :Provider account.', ['provider' => Providers::name($provider)])
                 );
             }
 
@@ -138,10 +131,9 @@ protected function alreadyRegistered(Authenticatable $user, ?ConnectedAccount $a
             return $this->login($user);
         }
 
-        $messageBag = new MessageBag;
-        $messageBag->add('socialstream', __('An account with that :Provider sign in already exists, please login.', ['provider' => Providers::buttonLabel($provider)]));
-
-        return redirect()->route('login')->withErrors($messageBag);
+        return $this->redirectAuthFailed(
+            __('An account with that :Provider sign in already exists, please login.', ['provider' => Providers::buttonLabel($provider)])
+        );
     }
 
     /**
@@ -177,10 +169,32 @@ protected function register(string $provider, ProviderUser $providerAccount): Re
     /**
      * Authenticate the given user and return a login response.
      */
-    protected function login(Authenticatable $user): LoginResponse
+    protected function login(Authenticatable $user): RedirectResponse|LoginResponse
     {
         $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
 
-        return app(LoginResponse::class);
+        $previousUrl = session()->get('socialstream.previous_url');
+
+        return match(true) {
+            Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => redirect()
+                ->route('filament.home'),
+            $this->hasComposerPackage('laravel/breeze') => redirect()
+                ->to('/dashboard'),
+            $this->hasComposerPackage('laravel/jetstream') => app(LoginResponse::class),
+            default => redirect()
+                ->to(RouteServiceProvider::HOME),
+        };
+    }
+
+    private function redirectAuthFailed(string $error): RedirectResponse
+    {
+        $previousUrl = session()->get('socialstream.previous_url');
+
+        return redirect()->route(match (true) {
+            Route::has('login') && $previousUrl === route('login') => 'login',
+            Route::has('register') && $previousUrl === route('register') => 'register',
+            Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => 'filament.auth.login',
+            default => 'login',
+        })->withErrors((new MessageBag)->add('socialstream', $error));
     }
 }
diff --git a/src/Actions/GenerateRedirectForProvider.php b/src/Actions/GenerateRedirectForProvider.php
index 7dad653a..92b8dd81 100644
--- a/src/Actions/GenerateRedirectForProvider.php
+++ b/src/Actions/GenerateRedirectForProvider.php
@@ -13,6 +13,11 @@ class GenerateRedirectForProvider implements GeneratesProviderRedirect
      */
     public function generate(string $provider): RedirectResponse
     {
+        session()->put(
+            key: 'socialstream.previous_url',
+            value: url()->previous(),
+        );
+
         return Socialite::driver($provider)->redirect();
     }
 }
diff --git a/src/Actions/HandleOAuthCallbackErrors.php b/src/Actions/HandleOAuthCallbackErrors.php
new file mode 100644
index 00000000..f8c46f18
--- /dev/null
+++ b/src/Actions/HandleOAuthCallbackErrors.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace JoelButcher\Socialstream\Actions;
+
+use App\Providers\RouteServiceProvider;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\MessageBag;
+use JoelButcher\Socialstream\Concerns\InteractsWithComposer;
+use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
+
+class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
+{
+    use InteractsWithComposer;
+
+    /**
+     * Handles the request if the "errors" key is present.
+     */
+    public function handle(Request $request): ?RedirectResponse
+    {
+        if (! $request->has('error')) {
+            return null;
+        }
+
+        $error = $request->get('error_description');
+
+        if (! auth()->check()) {
+            return $this->unauthenticatedRedirectWithError($error);
+        }
+
+        $previousUrl = session()->get('socialstream.previous_url');
+
+        if (Route::has('filament.home') && $previousUrl === route('filament.home')) {
+            return redirect()
+                ->route('filament.home')
+                ->withErrors((new MessageBag)->add('socialstream', $error));
+        }
+
+        if ($this->hasComposerPackage('laravel/breeze')) {
+            return redirect()
+                ->route(match(true) {
+                    Route::has('profile.show') => 'profile.show',
+                    Route::has('profile.edit') => 'profile.edit',
+                    Route::has('profile') => 'profile',
+                })
+                ->withErrors(['callback' => $error]);
+        }
+
+        // Jetstream
+        return redirect()
+            ->route('profile.show')
+            ->dangerBanner($error);
+    }
+
+    private function unauthenticatedRedirectWithError(string $error): RedirectResponse
+    {
+        $previousUrl = session()->get('socialstream.previous_url');
+
+        if (Route::has('filament.admin.auth.login') && $previousUrl === route('filament.admin.auth.login')) {
+            return redirect()
+                ->route('filament.admin.auth.login')
+                ->withErrors((new MessageBag)->add('socialstream', $error));
+        }
+
+        return redirect()->route('login')->withErrors((new MessageBag)->add('socialstream', $error));
+    }
+}
diff --git a/src/Installer/Drivers/Jetstream/JetstreamDriver.php b/src/Installer/Drivers/Jetstream/JetstreamDriver.php
index 07832201..7f4ce649 100644
--- a/src/Installer/Drivers/Jetstream/JetstreamDriver.php
+++ b/src/Installer/Drivers/Jetstream/JetstreamDriver.php
@@ -21,7 +21,7 @@ abstract class JetstreamDriver extends Driver
     abstract protected static function stack(): JetstreamInstallStack;
 
     /**
-     * Check for, and install Laravel Jetstream, if required,.
+     * Check for, and install Laravel Jetstream, if required.
      */
     protected function ensureDependenciesAreInstalled(string $composerBinary, InstallOptions ...$options): void
     {
diff --git a/src/SocialstreamServiceProvider.php b/src/SocialstreamServiceProvider.php
index f27e546a..ba4c0d2b 100644
--- a/src/SocialstreamServiceProvider.php
+++ b/src/SocialstreamServiceProvider.php
@@ -6,18 +6,13 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
-use JoelButcher\Socialstream\Actions\Auth\Breeze\Blade\AuthenticateOAuthCallback as BreezeBladeAuthenticateOAuthCallback;
-use JoelButcher\Socialstream\Actions\Auth\Breeze\HandleOAuthCallbackErrors as BreezeHandleOAuthCallbackErrors;
-use JoelButcher\Socialstream\Actions\Auth\Breeze\Livewire\AuthenticateOAuthCallback as BreezeLivewireAuthenticateOAuthCallback;
-use JoelButcher\Socialstream\Actions\Auth\Filament\AuthenticateOAuthCallback as FilamentAuthenticateOAuthCallback;
-use JoelButcher\Socialstream\Actions\Auth\Filament\HandleOAuthCallbackErrors as FilamentHandleOAuthCallbackErrors;
-use JoelButcher\Socialstream\Actions\Auth\Jetstream\AuthenticateOAuthCallback as JetstreamAuthenticateOAuthCallback;
-use JoelButcher\Socialstream\Actions\Auth\Jetstream\HandleOAuthCallbackErrors as JetstreamHandleOAuthCallbackErrors;
+use JoelButcher\Socialstream\Actions\AuthenticateOAuthCallback;
 use JoelButcher\Socialstream\Actions\CreateConnectedAccount;
 use JoelButcher\Socialstream\Actions\CreateUserFromProvider;
 use JoelButcher\Socialstream\Actions\CreateUserWithTeamsFromProvider;
 use JoelButcher\Socialstream\Actions\GenerateRedirectForProvider;
 use JoelButcher\Socialstream\Actions\HandleInvalidState;
+use JoelButcher\Socialstream\Actions\HandleOAuthCallbackErrors;
 use JoelButcher\Socialstream\Actions\ResolveSocialiteUser;
 use JoelButcher\Socialstream\Actions\SetUserPassword;
 use JoelButcher\Socialstream\Actions\UpdateConnectedAccount;
@@ -60,6 +55,9 @@ public function register(): void
      */
     public function boot(): void
     {
+        Socialstream::authenticatesOAuthCallbackUsing(AuthenticateOAuthCallback::class);
+        Socialstream::handlesOAuthCallbackErrorsUsing(HandleOAuthCallbackErrors::class);
+
         $this->configureRoutes();
         $this->configureCommands();
         $this->configureActions();
@@ -68,10 +66,13 @@ public function boot(): void
         match (true) {
             $this->hasComposerPackage('laravel/breeze') => $this->bootLaravelBreeze(),
             $this->hasComposerPackage('laravel/jetstream') => $this->bootLaravelJetstream(),
-            $this->hasComposerPackage('filament/filament') => $this->bootFilament(),
             default => null,
         };
 
+        if ($this->hasComposerPackage('filament/filament')) {
+            $this->bootFilament();
+        }
+
         if ($this->hasComposerPackage('inertiajs/inertia-laravel')) {
             $this->bootInertia();
         }
@@ -159,9 +160,6 @@ protected function configureRefreshTokenResolvers(): void
     protected function bootLaravelJetstream(): void
     {
         Socialstream::setUserPasswordsUsing(SetUserPassword::class);
-        Socialstream::authenticatesOAuthCallbackUsing(JetstreamAuthenticateOAuthCallback::class);
-        Socialstream::handlesOAuthCallbackErrorsUsing(JetstreamHandleOAuthCallbackErrors::class);
-
         if (! $this->app->runningInConsole()) {
             return;
         }
@@ -191,12 +189,6 @@ protected function bootLaravelJetstream(): void
      */
     protected function bootLaravelBreeze(): void
     {
-        Socialstream::handlesOAuthCallbackErrorsUsing(BreezeHandleOAuthCallbackErrors::class);
-        Socialstream::authenticatesOAuthCallbackUsing(match (true) {
-            class_exists('\App\Providers\VoltServiceProvider') => BreezeLivewireAuthenticateOAuthCallback::class,
-            default => BreezeBladeAuthenticateOAuthCallback::class,
-        });
-
         if (! $this->app->runningInConsole()) {
             return;
         }
@@ -238,9 +230,6 @@ class_exists('\App\Providers\VoltServiceProvider') => BreezeLivewireAuthenticate
      */
     protected function bootFilament(): void
     {
-        Socialstream::authenticatesOAuthCallbackUsing(FilamentAuthenticateOAuthCallback::class);
-        Socialstream::handlesOAuthCallbackErrorsUsing(FilamentHandleOAuthCallbackErrors::class);
-
         $this->loadViewsFrom(__DIR__.'/../resources/filament/views', 'socialstream');
 
         if (! $this->app->runningInConsole()) {
diff --git a/tests/JetstreamTestCase.php b/tests/JetstreamTestCase.php
index 8b17b266..5caee7da 100644
--- a/tests/JetstreamTestCase.php
+++ b/tests/JetstreamTestCase.php
@@ -3,8 +3,8 @@
 namespace JoelButcher\Socialstream\Tests;
 
 use Illuminate\Support\Facades\Config;
-use JoelButcher\Socialstream\Actions\Auth\Jetstream\AuthenticateOAuthCallback;
-use JoelButcher\Socialstream\Actions\Auth\Jetstream\HandleOAuthCallbackErrors;
+use JoelButcher\Socialstream\Actions\AuthenticateOAuthCallback;
+use JoelButcher\Socialstream\Actions\HandleOAuthCallbackErrors;
 use JoelButcher\Socialstream\Socialstream;
 use Laravel\Fortify\FortifyServiceProvider;
 use Laravel\Jetstream\JetstreamServiceProvider;

From b56848acf593f383c4b2801478ec6a3e7b39726a Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Thu, 26 Oct 2023 18:19:46 +0100
Subject: [PATCH 2/8] wip

---
 src/Actions/AuthenticateOAuthCallback.php |  8 +++----
 src/Actions/HandleOAuthCallbackErrors.php | 27 +++++++++--------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/Actions/AuthenticateOAuthCallback.php b/src/Actions/AuthenticateOAuthCallback.php
index 25d64f0a..dd31bbaf 100644
--- a/src/Actions/AuthenticateOAuthCallback.php
+++ b/src/Actions/AuthenticateOAuthCallback.php
@@ -173,13 +173,13 @@ protected function login(Authenticatable $user): RedirectResponse|LoginResponse
     {
         $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
 
-        $previousUrl = session()->get('socialstream.previous_url');
+        $previousUrl = session()->pull('socialstream.previous_url');
 
         return match(true) {
             Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => redirect()
-                ->route('filament.home'),
+                ->route('admin'),
             $this->hasComposerPackage('laravel/breeze') => redirect()
-                ->to('/dashboard'),
+                ->route('dashboard'),
             $this->hasComposerPackage('laravel/jetstream') => app(LoginResponse::class),
             default => redirect()
                 ->to(RouteServiceProvider::HOME),
@@ -188,7 +188,7 @@ protected function login(Authenticatable $user): RedirectResponse|LoginResponse
 
     private function redirectAuthFailed(string $error): RedirectResponse
     {
-        $previousUrl = session()->get('socialstream.previous_url');
+        $previousUrl = session()->pull('socialstream.previous_url');
 
         return redirect()->route(match (true) {
             Route::has('login') && $previousUrl === route('login') => 'login',
diff --git a/src/Actions/HandleOAuthCallbackErrors.php b/src/Actions/HandleOAuthCallbackErrors.php
index f8c46f18..85f87cd0 100644
--- a/src/Actions/HandleOAuthCallbackErrors.php
+++ b/src/Actions/HandleOAuthCallbackErrors.php
@@ -29,33 +29,28 @@ public function handle(Request $request): ?RedirectResponse
             return $this->unauthenticatedRedirectWithError($error);
         }
 
-        $previousUrl = session()->get('socialstream.previous_url');
+        $previousUrl = session()->pull('socialstream.previous_url');
 
-        if (Route::has('filament.home') && $previousUrl === route('filament.home')) {
-            return redirect()
+        return match(true) {
+            Route::has('filament.home') && $previousUrl === route('filament.home') => redirect()
                 ->route('filament.home')
-                ->withErrors((new MessageBag)->add('socialstream', $error));
-        }
-
-        if ($this->hasComposerPackage('laravel/breeze')) {
-            return redirect()
+                ->withErrors((new MessageBag)->add('socialstream', $error)),
+            $this->hasComposerPackage('laravel/breeze') => redirect()
                 ->route(match(true) {
                     Route::has('profile.show') => 'profile.show',
                     Route::has('profile.edit') => 'profile.edit',
                     Route::has('profile') => 'profile',
                 })
-                ->withErrors(['callback' => $error]);
-        }
-
-        // Jetstream
-        return redirect()
-            ->route('profile.show')
-            ->dangerBanner($error);
+                ->withErrors(['callback' => $error]),
+            default => redirect()
+                ->route('profile.show')
+                ->dangerBanner($error),
+        };
     }
 
     private function unauthenticatedRedirectWithError(string $error): RedirectResponse
     {
-        $previousUrl = session()->get('socialstream.previous_url');
+        $previousUrl = session()->pull('socialstream.previous_url');
 
         if (Route::has('filament.admin.auth.login') && $previousUrl === route('filament.admin.auth.login')) {
             return redirect()

From 91585e3050bdd59f92fdfa3d0dd375bde28b600d Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Thu, 26 Oct 2023 18:29:38 +0100
Subject: [PATCH 3/8] comment

---
 src/Actions/AuthenticateOAuthCallback.php | 8 ++++++++
 src/Actions/HandleOAuthCallbackErrors.php | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/Actions/AuthenticateOAuthCallback.php b/src/Actions/AuthenticateOAuthCallback.php
index dd31bbaf..0166a442 100644
--- a/src/Actions/AuthenticateOAuthCallback.php
+++ b/src/Actions/AuthenticateOAuthCallback.php
@@ -173,6 +173,10 @@ protected function login(Authenticatable $user): RedirectResponse|LoginResponse
     {
         $this->guard->login($user, Socialstream::hasRememberSessionFeatures());
 
+        // Because users can have multiple stacks installed for which they may wish to use
+        // Socialstream for, we will need to determine the redirect path based on a few
+        // different factors, such as the presence of Filament's auth routes etc.
+
         $previousUrl = session()->pull('socialstream.previous_url');
 
         return match(true) {
@@ -190,6 +194,10 @@ private function redirectAuthFailed(string $error): RedirectResponse
     {
         $previousUrl = session()->pull('socialstream.previous_url');
 
+        // Because users can have multiple stacks installed for which they may wish to use
+        // Socialstream for, we will need to determine the redirect path based on a few
+        // different factors, such as the presence of Filament's auth routes etc.
+
         return redirect()->route(match (true) {
             Route::has('login') && $previousUrl === route('login') => 'login',
             Route::has('register') && $previousUrl === route('register') => 'register',
diff --git a/src/Actions/HandleOAuthCallbackErrors.php b/src/Actions/HandleOAuthCallbackErrors.php
index 85f87cd0..5e58123a 100644
--- a/src/Actions/HandleOAuthCallbackErrors.php
+++ b/src/Actions/HandleOAuthCallbackErrors.php
@@ -25,6 +25,10 @@ public function handle(Request $request): ?RedirectResponse
 
         $error = $request->get('error_description');
 
+        // Because users can have multiple stacks installed for which they may wish to use
+        // Socialstream for, we will need to determine the redirect path based on a few
+        // different factors, such as the presence of Filament's auth routes etc.
+
         if (! auth()->check()) {
             return $this->unauthenticatedRedirectWithError($error);
         }

From 85dfa16f0f4d6cd01e5ba47fbe4020f0036001d1 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 27 Oct 2023 12:05:25 +0100
Subject: [PATCH 4/8] banners

---
 src/Http/Livewire/ConnectedAccountsForm.php | 4 ++--
 src/Http/Livewire/SetPasswordForm.php       | 5 ++++-
 src/SetsProfilePhotoFromUrl.php             | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Http/Livewire/ConnectedAccountsForm.php b/src/Http/Livewire/ConnectedAccountsForm.php
index 8ff0d16b..b58f4c47 100644
--- a/src/Http/Livewire/ConnectedAccountsForm.php
+++ b/src/Http/Livewire/ConnectedAccountsForm.php
@@ -81,7 +81,7 @@ public function setAvatarAsProfilePhoto(string|int $id): void
             $user->setProfilePhotoFromUrl($account->avatar_path);
         }
 
-        session()->flash('flash.banner', __('Profile photo updated'));
+        $this->banner(__('Profile photo updated'));
 
         redirect()->route('profile.show');
     }
@@ -104,7 +104,7 @@ public function removeConnectedAccount(): void
             ->where('user_id', auth()->user()->id)
             ->delete();
 
-        session()->flash('flash.banner', __('Account removed'));
+        $this->banner(__('Account removed.'));
 
         redirect()->route('profile.show');
     }
diff --git a/src/Http/Livewire/SetPasswordForm.php b/src/Http/Livewire/SetPasswordForm.php
index 407860c5..ca2594c9 100644
--- a/src/Http/Livewire/SetPasswordForm.php
+++ b/src/Http/Livewire/SetPasswordForm.php
@@ -4,10 +4,13 @@
 
 use Illuminate\View\View;
 use JoelButcher\Socialstream\Contracts\SetsUserPasswords;
+use Laravel\Jetstream\InteractsWithBanner;
 use Livewire\Component;
 
 class SetPasswordForm extends Component
 {
+    use InteractsWithBanner;
+
     /**
      * The component's state.
      *
@@ -32,7 +35,7 @@ public function setPassword(SetsUserPasswords $setter): void
             'password_confirmation' => '',
         ];
 
-        session()->flash('flash.banner', __('Your password has been set.'));
+        $this->banner(__('Your password has been set.'));
 
         redirect()->route('profile.show');
     }
diff --git a/src/SetsProfilePhotoFromUrl.php b/src/SetsProfilePhotoFromUrl.php
index 6db7f852..7918f9a1 100644
--- a/src/SetsProfilePhotoFromUrl.php
+++ b/src/SetsProfilePhotoFromUrl.php
@@ -22,7 +22,7 @@ public function setProfilePhotoFromUrl(string $url): void
 
             $this->updateProfilePhoto(new UploadedFile($file, $name));
         } else {
-            session()->flash('flash.banner', 'Unable to retrive image');
+            session()->flash('flash.banner', 'Unable to retrieve image');
             session()->flash('flash.bannerStyle', 'danger');
         }
     }

From 37b76ae46f6cc07e40e7820046e7bcf20453b229 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 27 Oct 2023 12:10:11 +0100
Subject: [PATCH 5/8] fix: tests

---
 composer.json                                    |  3 ++-
 src/Actions/AuthenticateOAuthCallback.php        |  1 +
 tests/Feature/SocialstreamTest.php               | 11 ++++++-----
 tests/JetstreamTestCase.php                      |  3 ++-
 workbench/app/Providers/RouteServiceProvider.php | 10 ++++++++++
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 workbench/app/Providers/RouteServiceProvider.php

diff --git a/composer.json b/composer.json
index 2a674dc8..ad8d7163 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,8 @@
                 "stubs/breeze/default/app/",
                 "stubs/breeze/inertia-common/app/",
                 "stubs/jetstream/app/",
-                "stubs/filament/app/"
+                "stubs/filament/app/",
+                "workbench/app/"
             ]
         }
     },
diff --git a/src/Actions/AuthenticateOAuthCallback.php b/src/Actions/AuthenticateOAuthCallback.php
index 0166a442..62eda192 100644
--- a/src/Actions/AuthenticateOAuthCallback.php
+++ b/src/Actions/AuthenticateOAuthCallback.php
@@ -2,6 +2,7 @@
 
 namespace JoelButcher\Socialstream\Actions;
 
+use App\Providers\RouteServiceProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Http\RedirectResponse;
diff --git a/tests/Feature/SocialstreamTest.php b/tests/Feature/SocialstreamTest.php
index b3e383d0..faf78f06 100644
--- a/tests/Feature/SocialstreamTest.php
+++ b/tests/Feature/SocialstreamTest.php
@@ -3,6 +3,7 @@
 namespace JoelButcher\Socialstream\Tests\Feature;
 
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Facades\Config;
@@ -94,7 +95,7 @@ public function generate(string $provider): RedirectResponse
 
     $response = get('http://localhost/oauth/github/callback');
 
-    $response->assertRedirect('/home');
+    $response->assertRedirect(RouteServiceProvider::HOME);
 
     $this->assertAuthenticated();
     $this->assertDatabaseHas('users', ['email' => 'joel@socialstream.dev']);
@@ -145,7 +146,7 @@ public function generate(string $provider): RedirectResponse
     Socialite::shouldReceive('driver')->once()->with('github')->andReturn($provider);
 
     get('http://localhost/oauth/github/callback')
-        ->assertRedirect('/home');
+        ->assertRedirect(RouteServiceProvider::HOME);
 
     $this->assertAuthenticated();
 });
@@ -216,7 +217,7 @@ public function generate(string $provider): RedirectResponse
     Socialite::shouldReceive('driver')->once()->with('github')->andReturn($provider);
 
     get('http://localhost/oauth/github/callback')
-        ->assertRedirect('/home');
+        ->assertRedirect(RouteServiceProvider::HOME);
 
     $this->assertAuthenticated();
     $this->assertDatabaseHas('connected_accounts', [
@@ -261,7 +262,7 @@ public function generate(string $provider): RedirectResponse
     session()->put('socialstream.previous_url', route('register'));
 
     get('http://localhost/oauth/github/callback')
-        ->assertRedirect('/home');
+        ->assertRedirect(RouteServiceProvider::HOME);
 
     $this->assertAuthenticated();
     $this->assertDatabaseHas('connected_accounts', [
@@ -296,7 +297,7 @@ public function generate(string $provider): RedirectResponse
     session()->put('socialstream.previous_url', route('register'));
 
     get('http://localhost/oauth/github/callback')
-        ->assertRedirect('/home');
+        ->assertRedirect(RouteServiceProvider::HOME);
 
     $user = User::first();
 
diff --git a/tests/JetstreamTestCase.php b/tests/JetstreamTestCase.php
index 5caee7da..1aa3d559 100644
--- a/tests/JetstreamTestCase.php
+++ b/tests/JetstreamTestCase.php
@@ -8,6 +8,7 @@
 use JoelButcher\Socialstream\Socialstream;
 use Laravel\Fortify\FortifyServiceProvider;
 use Laravel\Jetstream\JetstreamServiceProvider;
+use Livewire\LivewireServiceProvider;
 
 abstract class JetstreamTestCase extends TestCase
 {
@@ -26,7 +27,7 @@ protected function getPackageProviders($app): array
     {
         return array_merge(
             parent::getPackageProviders($app),
-            [JetstreamServiceProvider::class, FortifyServiceProvider::class]
+            [LivewireServiceProvider::class, JetstreamServiceProvider::class, FortifyServiceProvider::class]
         );
     }
 }
diff --git a/workbench/app/Providers/RouteServiceProvider.php b/workbench/app/Providers/RouteServiceProvider.php
new file mode 100644
index 00000000..3c46a886
--- /dev/null
+++ b/workbench/app/Providers/RouteServiceProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    public const HOME = '/dashboard';
+}

From b766dd18f8c08210c5067649cbd928473a73c060 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 27 Oct 2023 12:10:48 +0100
Subject: [PATCH 6/8] chore: gitattributes

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index f9347ec9..b4e207e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,7 @@
 *.php diff=php
 
 /.github export-ignore
+/workbench export-ignore
 /tests export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore

From b505682ec4f157ba723b95ca472aac47e2f27896 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 27 Oct 2023 12:15:25 +0100
Subject: [PATCH 7/8] fix: dev deps

---
 composer.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composer.json b/composer.json
index ad8d7163..7289d977 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
     ],
     "require": {
         "php": "^8.1",
+        "illuminate/contracts": "^10",
         "laravel/prompts": "^0.1.10",
         "laravel/socialite": "^5.9",
         "webmozart/assert": "^1.11"
@@ -28,6 +29,7 @@
         "laravel/breeze": "^1.25",
         "laravel/jetstream": "^4.0",
         "laravel/sanctum": "^3.3",
+        "livewire/livewire": "^3",
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "^8.0",
         "pestphp/pest": "^2.0",

From 443d74b3c9ec62f4b6bbfe8d71c8ef7251e3ccff Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 27 Oct 2023 12:17:50 +0100
Subject: [PATCH 8/8] fix: style

---
 src/Actions/AuthenticateOAuthCallback.php | 2 +-
 src/Actions/HandleOAuthCallbackErrors.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Actions/AuthenticateOAuthCallback.php b/src/Actions/AuthenticateOAuthCallback.php
index 62eda192..7095e839 100644
--- a/src/Actions/AuthenticateOAuthCallback.php
+++ b/src/Actions/AuthenticateOAuthCallback.php
@@ -180,7 +180,7 @@ protected function login(Authenticatable $user): RedirectResponse|LoginResponse
 
         $previousUrl = session()->pull('socialstream.previous_url');
 
-        return match(true) {
+        return match (true) {
             Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => redirect()
                 ->route('admin'),
             $this->hasComposerPackage('laravel/breeze') => redirect()
diff --git a/src/Actions/HandleOAuthCallbackErrors.php b/src/Actions/HandleOAuthCallbackErrors.php
index 5e58123a..b7849398 100644
--- a/src/Actions/HandleOAuthCallbackErrors.php
+++ b/src/Actions/HandleOAuthCallbackErrors.php
@@ -2,7 +2,6 @@
 
 namespace JoelButcher\Socialstream\Actions;
 
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
@@ -35,12 +34,12 @@ public function handle(Request $request): ?RedirectResponse
 
         $previousUrl = session()->pull('socialstream.previous_url');
 
-        return match(true) {
+        return match (true) {
             Route::has('filament.home') && $previousUrl === route('filament.home') => redirect()
                 ->route('filament.home')
                 ->withErrors((new MessageBag)->add('socialstream', $error)),
             $this->hasComposerPackage('laravel/breeze') => redirect()
-                ->route(match(true) {
+                ->route(match (true) {
                     Route::has('profile.show') => 'profile.show',
                     Route::has('profile.edit') => 'profile.edit',
                     Route::has('profile') => 'profile',