Fortify: Pass to 2fa confirmation after password reset

[sidewaysglance]

Hi,

I have an invite only app which enforces 2fa - this is all ok so far, no problems, enforcement via middleware.

My intention is that admins POST new users' email addresses, they are User::create()d, and a customised password reset email goes out for the users to complete onboarding - create a password & set up 2fa.

I would like the onboarding process to be slick, and therefore would like the password reset to redirect to the '/two-factor-challenge' route, rather than back to login.

The default behaviour after password reset is to redirect to the login form.

I have tried registering an EventListener:

namespace App\Listeners;

use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Http\Request;

class AuthenticateResetUser
{
    public function __construct(Request $request)
    {
        $this->request = $request;
    }

    public function handle(PasswordReset $event)
    {

        Log::debug(__FILE__ . __LINE__);
        Log::debug($this->request->toArray());
       
        // *all of these go too far & seem to log the user in - I want to move to partially authenticated, ready for 2fa*
        Auth::login($event->user);
        Auth::validate(['email' => $this->request->email, 'password' => $this->request->password]); // returns bool
        Auth::attempt(['email' => $this->request->email, 'password' => $this->request->password]); // returns bool

        if (auth()->user()->two_factor_secret) {
            Log::debug(__FILE__ . __LINE__); // appears in log
            return redirect()->to('/two-factor-challenge'); // don't ever get redirected here from what I can see in Chrome dev tools
            //My tmp log directive in TwoFactorAuthenticatedSessionController create method doesn't trigger
        }

        Log::debug(__FILE__ . __LINE__); // doesn't appear in log
        return redirect()->to('/dashboard'); // we end up here but I'm sure it's not via this return
    }
}

Can anyone help please