feat: complete user authentication, admin guard, customer account dashboard and branded HTML emails
This commit is contained in:
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Order;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class AccountController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the customer account dashboard & order history.
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
$orders = Order::where('user_id', $user->id)
|
||||
->orWhere('customer_email', $user->email)
|
||||
->with('items')
|
||||
->latest()
|
||||
->get();
|
||||
|
||||
return view('account.index', compact('user', 'orders'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update customer profile info.
|
||||
*/
|
||||
public function updateProfile(Request $request): RedirectResponse
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
$validated = $request->validate([
|
||||
'name' => 'required|string|max:255',
|
||||
'email' => ['required', 'email', 'max:255', Rule::unique('users')->ignore($user->id)],
|
||||
]);
|
||||
|
||||
$user->update($validated);
|
||||
|
||||
return back()->with('success', 'Jouw profielgegevens zijn succesvol bijgewerkt.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Update customer password.
|
||||
*/
|
||||
public function updatePassword(Request $request): RedirectResponse
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
$validated = $request->validate([
|
||||
'current_password' => 'required|current_password',
|
||||
'password' => 'required|string|min:8|confirmed',
|
||||
], [
|
||||
'current_password.current_password' => 'Het huidige wachtwoord is onjuist.',
|
||||
'password.min' => 'Het nieuwe wachtwoord moet minimaal 8 tekens lang zijn.',
|
||||
'password.confirmed' => 'De nieuwe wachtwoorden komen niet met elkaar overeen.',
|
||||
]);
|
||||
|
||||
$user->update([
|
||||
'password' => Hash::make($validated['password']),
|
||||
]);
|
||||
|
||||
return back()->with('success', 'Jouw wachtwoord is succesvol gewijzigd.');
|
||||
}
|
||||
}
|
||||
@@ -46,4 +46,3 @@ class CategoryController extends Controller
|
||||
->with('success', "Categorie '{$category->name}' is succesvol bijgewerkt!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -133,4 +133,3 @@ class ContentController extends Controller
|
||||
->with('success', 'Alle teksten en lay-out instellingen zijn hersteld naar de standaarden.');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,4 +51,3 @@ class OrderController extends Controller
|
||||
->with('success', "Bestelling #{$order->order_number} status is gewijzigd naar '{$validated['status']}'!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -132,4 +132,3 @@ class ProductController extends Controller
|
||||
->with('success', "Product '{$name}' is verwijderd.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\PasswordResetMail;
|
||||
use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Illuminate\View\View;
|
||||
use Throwable;
|
||||
|
||||
class ForgotPasswordController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the form to request a password reset link.
|
||||
*/
|
||||
public function showLinkRequestForm(): View
|
||||
{
|
||||
return view('auth.forgot-password');
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a reset link to the given user.
|
||||
*/
|
||||
public function sendResetLinkEmail(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'email' => 'required|email',
|
||||
]);
|
||||
|
||||
$user = User::where('email', $request->input('email'))->first();
|
||||
|
||||
// Always show friendly message to prevent email enumeration
|
||||
if (! $user) {
|
||||
return back()->with('success', 'Als dit e-mailadres bij ons bekend is, hebben we zojuist een herstellink verstuurd.');
|
||||
}
|
||||
|
||||
$token = Str::random(64);
|
||||
|
||||
DB::table('password_reset_tokens')->updateOrInsert(
|
||||
['email' => $user->email],
|
||||
[
|
||||
'token' => Hash::make($token),
|
||||
'created_at' => Carbon::now(),
|
||||
]
|
||||
);
|
||||
|
||||
$resetUrl = route('password.reset', [
|
||||
'token' => $token,
|
||||
'email' => $user->email,
|
||||
]);
|
||||
|
||||
try {
|
||||
Mail::to($user->email)->send(new PasswordResetMail($user, $resetUrl));
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
}
|
||||
|
||||
return back()->with('success', 'Als dit e-mailadres bij ons bekend is, hebben we zojuist een herstellink verstuurd.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the password reset view for the given token.
|
||||
*/
|
||||
public function showResetForm(Request $request, string $token): View
|
||||
{
|
||||
return view('auth.reset-password', [
|
||||
'token' => $token,
|
||||
'email' => $request->input('email'),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the given user's password.
|
||||
*/
|
||||
public function reset(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'token' => 'required|string',
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|string|min:8|confirmed',
|
||||
], [
|
||||
'password.min' => 'Het nieuwe wachtwoord moet minimaal 8 tekens lang zijn.',
|
||||
'password.confirmed' => 'De wachtwoorden komen niet met elkaar overeen.',
|
||||
]);
|
||||
|
||||
$record = DB::table('password_reset_tokens')
|
||||
->where('email', $request->input('email'))
|
||||
->first();
|
||||
|
||||
if (! $record || ! Hash::check($request->input('token'), $record->token)) {
|
||||
throw ValidationException::withMessages([
|
||||
'email' => ['Deze herstellink is ongeldig of verlopen.'],
|
||||
]);
|
||||
}
|
||||
|
||||
if (Carbon::parse($record->created_at)->addMinutes(60)->isPast()) {
|
||||
DB::table('password_reset_tokens')->where('email', $request->input('email'))->delete();
|
||||
throw ValidationException::withMessages([
|
||||
'email' => ['Deze herstellink is verlopen. Vraag alsjeblieft een nieuwe link aan.'],
|
||||
]);
|
||||
}
|
||||
|
||||
$user = User::where('email', $request->input('email'))->firstOrFail();
|
||||
$user->update([
|
||||
'password' => Hash::make($request->input('password')),
|
||||
]);
|
||||
|
||||
DB::table('password_reset_tokens')->where('email', $request->input('email'))->delete();
|
||||
|
||||
Auth::login($user);
|
||||
|
||||
return redirect()->route('account.index')
|
||||
->with('success', 'Jouw wachtwoord is succesvol gewijzigd! Je bent direct ingelogd.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class LoginController extends Controller
|
||||
{
|
||||
/**
|
||||
* Show the login form.
|
||||
*/
|
||||
public function showLoginForm(): View|RedirectResponse
|
||||
{
|
||||
if (Auth::check()) {
|
||||
return Auth::user()->isAdmin()
|
||||
? redirect()->route('admin.content.index')
|
||||
: redirect()->route('account.index');
|
||||
}
|
||||
|
||||
return view('auth.login');
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a login request.
|
||||
*/
|
||||
public function login(Request $request): RedirectResponse
|
||||
{
|
||||
$credentials = $request->validate([
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|string',
|
||||
]);
|
||||
|
||||
$remember = $request->boolean('remember');
|
||||
|
||||
if (Auth::attempt($credentials, $remember)) {
|
||||
$request->session()->regenerate();
|
||||
|
||||
$user = Auth::user();
|
||||
|
||||
if ($user->isAdmin()) {
|
||||
return redirect()->intended(route('admin.content.index'))
|
||||
->with('success', "Welkom terug, {$user->name}! Je bent ingelogd als beheerder.");
|
||||
}
|
||||
|
||||
return redirect()->intended(route('account.index'))
|
||||
->with('success', "Welkom terug, {$user->name}!");
|
||||
}
|
||||
|
||||
throw ValidationException::withMessages([
|
||||
'email' => ['Deze inloggegevens komen niet overeen met onze gegevens.'],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log the user out.
|
||||
*/
|
||||
public function logout(Request $request): RedirectResponse
|
||||
{
|
||||
Auth::logout();
|
||||
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
|
||||
return redirect()->route('home')
|
||||
->with('success', 'Je bent succesvol uitgelogd.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\WelcomeMail;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\View\View;
|
||||
use Throwable;
|
||||
|
||||
class RegisterController extends Controller
|
||||
{
|
||||
/**
|
||||
* Show the registration form.
|
||||
*/
|
||||
public function showRegistrationForm(): View|RedirectResponse
|
||||
{
|
||||
if (Auth::check()) {
|
||||
return redirect()->route('account.index');
|
||||
}
|
||||
|
||||
return view('auth.register');
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle an incoming registration request.
|
||||
*/
|
||||
public function register(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'name' => 'required|string|max:255',
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:8|confirmed',
|
||||
], [
|
||||
'name.required' => 'Vul alsjeblieft je naam in.',
|
||||
'email.required' => 'Vul alsjeblieft een geldig e-mailadres in.',
|
||||
'email.unique' => 'Er bestaat al een account met dit e-mailadres.',
|
||||
'password.required' => 'Kies een veilig wachtwoord.',
|
||||
'password.min' => 'Het wachtwoord moet minimaal 8 tekens lang zijn.',
|
||||
'password.confirmed' => 'De twee wachtwoorden komen niet met elkaar overeen.',
|
||||
]);
|
||||
|
||||
$user = User::create([
|
||||
'name' => $validated['name'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'is_admin' => false,
|
||||
]);
|
||||
|
||||
// Stuur welkomstmail
|
||||
try {
|
||||
Mail::to($user->email)->send(new WelcomeMail($user));
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
}
|
||||
|
||||
Auth::login($user);
|
||||
|
||||
return redirect()->route('account.index')
|
||||
->with('success', "Welkom bij Jouwdriedee.nl, {$user->name}! Je account is aangemaakt en er is een bevestiging gestuurd naar {$user->email}.");
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,11 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Mail\OrderConfirmationMail;
|
||||
use App\Models\Order;
|
||||
use App\Models\OrderItem;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class CheckoutController extends Controller
|
||||
@@ -59,6 +61,7 @@ class CheckoutController extends Controller
|
||||
$orderNumber = 'J3D-'.date('Y').'-'.strtoupper(Str::random(6));
|
||||
|
||||
$order = Order::create([
|
||||
'user_id' => auth()->id(),
|
||||
'order_number' => $orderNumber,
|
||||
'customer_name' => $validated['customer_name'],
|
||||
'customer_email' => $validated['customer_email'],
|
||||
@@ -100,6 +103,13 @@ class CheckoutController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
// Stuur mooie bestelbevestiging e-mail
|
||||
try {
|
||||
Mail::to($order->customer_email)->send(new OrderConfirmationMail($order->load('items')));
|
||||
} catch (\Throwable $e) {
|
||||
report($e);
|
||||
}
|
||||
|
||||
// Leeg winkelwagen na succesvolle plaatsing
|
||||
session()->forget('cart');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user