feat: complete user authentication, admin guard, customer account dashboard and branded HTML emails

This commit is contained in:
2026-11-01 13:55:45 +01:00
parent b6ee6938cb
commit ee89da5e61
37 changed files with 1895 additions and 22 deletions
@@ -0,0 +1,69 @@
<?php
namespace App\Console\Commands;
use App\Models\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
class AdminCredentialsCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:admin-credentials {--reset : Generate a new random password for the admin}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Toon of herstel de beheerder (admin) inloggegevens';
/**
* Execute the console command.
*/
public function handle(): int
{
$email = 'info@jouwdriedee.nl';
$admin = User::where('email', $email)->first();
if (! $admin || $this->option('reset')) {
$newPassword = Str::password(16);
$admin = User::updateOrCreate(
['email' => $email],
[
'name' => 'Jouwdriedee Beheer',
'password' => Hash::make($newPassword),
'is_admin' => true,
'email_verified_at' => now(),
]
);
$this->info('Admin gebruiker succesvol aangemaakt/bijgewerkt met een nieuw wachtwoord:');
$this->table(['Veld', 'Waarde'], [
['E-mailadres', $email],
['Nieuw Wachtwoord', $newPassword],
['Admin Status', 'Ja (is_admin = true)'],
]);
return self::SUCCESS;
}
$this->info("Admin gebruiker '{$email}' bestaat reeds in het systeem.");
$this->table(['Veld', 'Waarde'], [
['E-mailadres', $email],
['Naam', $admin->name],
['Admin Status', $admin->isAdmin() ? 'Ja' : 'Nee'],
['Aangemaakt op', $admin->created_at->format('d-m-Y H:i')],
]);
$this->line("Tip: Draai 'php artisan app:admin-credentials --reset' om een nieuw random wachtwoord te genereren.");
return self::SUCCESS;
}
}
@@ -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');
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class EnsureUserIsAdmin
{
/**
* Handle an incoming request.
*/
public function handle(Request $request, Closure $next): Response
{
if (! auth()->check()) {
return redirect()->guest(route('login'))
->with('error', 'Log eerst in met je beheerder-account om toegang te krijgen tot het admin gedeelte.');
}
if (! auth()->user()->isAdmin()) {
return redirect()->route('home')
->with('error', 'Je hebt geen beheerderstoegang tot deze pagina.');
}
return $next($request);
}
}
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Mail;
use App\Models\Order;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class OrderConfirmationMail extends Mailable
{
use Queueable, SerializesModels;
public function __construct(public Order $order) {}
public function envelope(): Envelope
{
return new Envelope(
subject: 'Bestelbevestiging #'.$this->order->order_number.' - Jouwdriedee.nl',
);
}
public function content(): Content
{
return new Content(
view: 'emails.order-confirmation',
);
}
}
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App\Mail;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class PasswordResetMail extends Mailable
{
use Queueable, SerializesModels;
public function __construct(
public User $user,
public string $resetUrl
) {}
public function envelope(): Envelope
{
return new Envelope(
subject: 'Wachtwoord opnieuw instellen voor Jouwdriedee.nl',
);
}
public function content(): Content
{
return new Content(
view: 'emails.password-reset',
);
}
}
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Mail;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class WelcomeMail extends Mailable
{
use Queueable, SerializesModels;
public function __construct(public User $user) {}
public function envelope(): Envelope
{
return new Envelope(
subject: 'Welkom bij Jouwdriedee.nl! 🎉',
);
}
public function content(): Content
{
return new Content(
view: 'emails.welcome',
);
}
}
+7
View File
@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Order extends Model
@@ -11,6 +12,7 @@ class Order extends Model
use HasFactory;
protected $fillable = [
'user_id',
'order_number',
'customer_name',
'customer_email',
@@ -40,6 +42,11 @@ class Order extends Model
return $this->hasMany(OrderItem::class);
}
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
public function getFormattedTotalAttribute(): string
{
return '€ '.number_format($this->total, 2, ',', '.');
+21 -2
View File
@@ -2,15 +2,15 @@
namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Attributes\Hidden;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
#[Fillable(['name', 'email', 'password'])]
#[Fillable(['name', 'email', 'password', 'is_admin'])]
#[Hidden(['password', 'remember_token'])]
class User extends Authenticatable
{
@@ -27,6 +27,25 @@ class User extends Authenticatable
return [
'email_verified_at' => 'datetime',
'password' => 'hashed',
'is_admin' => 'boolean',
];
}
/**
* Check if the user has administrative privileges.
*/
public function isAdmin(): bool
{
return (bool) $this->is_admin;
}
/**
* Orders placed by this user.
*
* @return HasMany<Order, $this>
*/
public function orders(): HasMany
{
return $this->hasMany(Order::class);
}
}
-1
View File
@@ -8,4 +8,3 @@ if (! function_exists('setting')) {
return Setting::get($key, $default);
}
}