ritual/scan.fyi
ritual/scan.fyi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First round of refinements on the login system...

Browse source 
There's a lot more to do on the to-do list
This commit is contained in:
Dan Baker 2026-02-22 20:02:09 +00:00
parent 82ed2e3ce2
commit 1b241aeddb
7 changed files with 390 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/Http/Controllers/Auth/MagicLinkController.php
View file

@ -9,7 +9,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\URL;
use Illuminate\Validation\ValidationException;
class MagicLinkController extends Controller
{
@ -34,35 +33,29 @@ class MagicLinkController extends Controller
'email' => 'required|email',
]);
$email = $request->email;
$ip = $request->ip();
$userAgent = $request->userAgent();
$result = $this->authService->sendMagicLink(
$request->email,
$request->ip(),
$request->userAgent()
);
try {
$token = $this->authService->sendMagicLink($email, $ip, $userAgent);
$loginUrl = URL::temporarySignedRoute(
'magic-link.verify',
now()->addMinutes(15),
['token' => $result->plainToken]
);
// Generate signed URL valid for 15 minutes
$loginUrl = URL::temporarySignedRoute(
'magic-link.verify',
now()->addMinutes(15),
['token' => $token->plain_token]
);
Mail::to($request->email)->queue(new MagicLoginLink($loginUrl, $result->plainCode, 15));
// Queue the magic link email
Mail::to($email)->queue(new MagicLoginLink($loginUrl, $token->plain_code, 15));
return redirect()->route('verify-code')
->with('status', 'Check your email for your login code!')
->with('email', $email);
} catch (ValidationException $e) {
throw $e;
}
return redirect()->route('verify-code')
->with('status', 'Check your email for your login code!')
->with('email', $request->email);
}
/**
* Show the code verification form.
*/
public function showCodeForm(Request $request)
public function showCodeForm()
{
return view('auth.verify-code');
}
@ -72,14 +65,11 @@ class MagicLinkController extends Controller
*/
public function verifyLink(Request $request)
{
// Validate the signed URL
if (!$request->hasValidSignature()) {
return redirect()->route('login')->with('error', 'Invalid or expired magic link.');
}
$token = $request->token;
if ($this->authService->verifyMagicLink($token)) {
if ($this->authService->verifyMagicLink($request->query('token'))) {
$request->session()->regenerate();
return redirect()->route('dashboard');
@ -98,22 +88,15 @@ class MagicLinkController extends Controller
'code' => 'required|digits:6',
]);
$email = $request->email;
$code = $request->code;
if ($this->authService->verifyCode($request->email, $request->code)) {
$request->session()->regenerate();
try {
if ($this->authService->verifyCode($email, $code)) {
$request->session()->regenerate();
return redirect()->route('dashboard');
}
return back()->withErrors([
'code' => 'Invalid or expired code.',
]);
} catch (ValidationException $e) {
throw $e;
return redirect()->route('dashboard');
}
return back()->withErrors([
'code' => 'Invalid or expired code.',
]);
}
/**