Fix MakerWorld 2FA duplicate email loop and add email SMTP diagnostics

app/Console/Commands/TestMailCommand.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;
+use Throwable;
+
+class TestMailCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:test-mail {email : Het e-mailadres van de ontvanger (bijv. je eigen Gmail)}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Verstuur een test e-mail en controleer de mailer/SMTP verbinding';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $recipient = $this->argument('email');
+        $defaultMailer = config('mail.default');
+        $smtpConfig = config("mail.mailers.{$defaultMailer}", []);
+        $fromAddress = config('mail.from.address');
+        $fromName = config('mail.from.name');
+
+        $this->info('=== Jouwdriedee.nl E-mail & SMTP Diagnostiek ===');
+        $this->table(['Instelling', 'Waarde'], [
+            ['Actieve Mailer (MAIL_MAILER)', $defaultMailer],
+            ['Verzender Adres (MAIL_FROM_ADDRESS)', $fromAddress],
+            ['Verzender Naam (MAIL_FROM_NAME)', $fromName],
+            ['SMTP Host', $smtpConfig['host'] ?? 'N.v.t. (geen smtp)'],
+            ['SMTP Poort', $smtpConfig['port'] ?? 'N.v.t.'],
+            ['SMTP Gebruiker', ! empty($smtpConfig['username']) ? $smtpConfig['username'] : '(geen / leeg)'],
+            ['SMTP Wachtwoord ingesteld?', ! empty($smtpConfig['password']) ? 'Ja' : 'Nee'],
+            ['Ontvanger', $recipient],
+        ]);
+
+        if ($defaultMailer === 'log') {
+            $this->warn("⚠️  WAARSCHUWING: MAIL_MAILER staat momenteel op 'log'!");
+            $this->warn('Dit betekent dat er GEEN echte mail via internet wordt verzonden naar Gmail.');
+            $this->warn('De mail wordt weggeschreven naar storage/logs/laravel.log.');
+            $this->warn('Stel MAIL_MAILER=smtp in met geldige SMTP-gegevens op Coolify om echte mails te ontvangen.');
+        }
+
+        $this->line("\nVersturen van testmail naar {$recipient}...");
+
+        try {
+            Mail::raw("Dit is een test e-mail vanaf Jouwdriedee.nl om te controleren of de mailserver en bezorging naar {$recipient} correct functioneert.\n\nVerzonden op: ".now()->toIso8601String(), function ($message) use ($recipient) {
+                $message->to($recipient)
+                    ->subject('Test E-mail vanaf Jouwdriedee.nl');
+            });
+
+            $this->info("✓ Test e-mail succesvol verzonden via driver '{$defaultMailer}'!");
+            if ($defaultMailer === 'log') {
+                $this->comment('Controleer storage/logs/laravel.log om de gelogde e-mail te zien.');
+            } else {
+                $this->info("Controleer nu je inbox (en eventueel spambox) op {$recipient}.");
+            }
+
+            return self::SUCCESS;
+        } catch (Throwable $e) {
+            $this->error('❌ FOUT BIJ HET VERZENDEN:');
+            $this->error($e->getMessage());
+            $this->line("\nStack trace:");
+            $this->line($e->getTraceAsString());
+
+            return self::FAILURE;
+        }
+    }
+}

app/Http/Controllers/Admin/ContentController.php

@@ -6,6 +6,8 @@ use App\Http\Controllers\Controller;
 use App\Models\Setting;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\View\View;
 
 class ContentController extends Controller
@@ -132,4 +134,38 @@ class ContentController extends Controller
         return redirect()->route('admin.content.index')
             ->with('success', 'Alle teksten en lay-out instellingen zijn hersteld naar de standaarden.');
     }
+
+    /**
+     * Send a test email to verify mail delivery (e.g. to Gmail).
+     */
+    public function sendTestMail(Request $request): RedirectResponse
+    {
+        $validated = $request->validate([
+            'test_email' => 'required|email',
+        ]);
+
+        $recipient = $validated['test_email'];
+        $defaultMailer = config('mail.default');
+        $fromAddress = config('mail.from.address');
+
+        try {
+            Mail::raw("Dit is een test e-mail vanaf Jouwdriedee.nl om de e-mail bezorging naar {$recipient} te controleren.\n\nActieve mailer: {$defaultMailer}\nAfzender: {$fromAddress}\nDatum: ".now()->format('d-m-Y H:i:s'), function ($message) use ($recipient) {
+                $message->to($recipient)
+                    ->subject('Test E-mail vanaf Jouwdriedee.nl');
+            });
+
+            if ($defaultMailer === 'log') {
+                return redirect()->back()
+                    ->with('warning', "De testmail is weggeschreven naar de serverlogs (MAIL_MAILER staat op 'log'). Er is GEEN echte e-mail naar {$recipient} verzonden. Stel op Coolify geldige SMTP-gegevens in (bijv. Brevo, Resend of je hosting SMTP) om echte e-mails te bezorgen.");
+            }
+
+            return redirect()->back()
+                ->with('success', "Test e-mail succesvol verzonden via driver '{$defaultMailer}' naar {$recipient}! Controleer je inbox en eventueel je spambox.");
+        } catch (\Throwable $e) {
+            Log::error('Test mail error: '.$e->getMessage(), ['trace' => $e->getTraceAsString()]);
+
+            return redirect()->back()
+                ->with('error', "Fout bij verzenden van e-mail via {$defaultMailer}: ".$e->getMessage());
+        }
+    }
 }

app/Http/Controllers/Admin/MakerWorldController.php

@@ -337,13 +337,13 @@ class MakerWorldController extends Controller
 
         if ($result['status'] === '2fa_required') {
             return redirect()
-                ->route('admin.makerworld.index')
+                ->route('admin.makerworld.index', ['tab' => 'auth'])
                 ->with('warning', $result['message'])
                 ->with('makerworld_2fa_account', $result['account']);
         }
 
         return redirect()
-            ->route('admin.makerworld.index')
+            ->route('admin.makerworld.index', ['tab' => 'auth'])
             ->with('error', $result['message']);
     }
 
@@ -369,11 +369,28 @@ class MakerWorldController extends Controller
         }
 
         return redirect()
-            ->route('admin.makerworld.index')
+            ->route('admin.makerworld.index', ['tab' => 'auth'])
             ->with('error', $result['message'])
             ->with('makerworld_2fa_account', $validated['account']);
     }
 
+    /**
+     * Resend verification code for 2FA manually on request.
+     */
+    public function resendCode(Request $request): RedirectResponse
+    {
+        $validated = $request->validate([
+            'account' => 'required|string',
+        ]);
+
+        $sent = $this->makerWorld->sendEmailVerificationCode($validated['account']);
+
+        return redirect()
+            ->route('admin.makerworld.index', ['tab' => 'auth'])
+            ->with($sent ? 'success' : 'error', $sent ? 'Er is een nieuwe verificatiecode verstuurd naar je e-mail.' : 'Kon verificatiecode niet opnieuw verzenden.')
+            ->with('makerworld_2fa_account', $validated['account']);
+    }
+
     /**
      * Save MakerWorld session / bearer token directly.
      */

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
@@ -61,6 +62,7 @@ class ForgotPasswordController extends Controller
         try {
             Mail::to($user->email)->send(new PasswordResetMail($user, $resetUrl));
         } catch (Throwable $e) {
+            Log::error("Fout bij verzenden van wachtwoordherstel e-mail naar {$user->email}: ".$e->getMessage());
             report($e);
         }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -9,6 +9,7 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\View\View;
 use Throwable;
@@ -56,6 +57,7 @@ class RegisterController extends Controller
         try {
             Mail::to($user->email)->send(new WelcomeMail($user));
         } catch (Throwable $e) {
+            Log::error("Fout bij verzenden van welkomstmail naar {$user->email}: ".$e->getMessage());
             report($e);
         }
 

app/Services/MakerWorldService.php

@@ -111,14 +111,12 @@ class MakerWorldService
                 ];
             }
 
-            // Check if 2FA code is needed
+            // Check if 2FA code is needed (Bambu Lab sends the code automatically when verifyCode is returned)
             if (isset($data['loginType']) && $data['loginType'] === 'verifyCode') {
-                $this->sendEmailVerificationCode($account);
-
                 return [
                     'status' => '2fa_required',
                     'account' => $account,
-                    'message' => 'Verificatiecode vereist. We hebben een 6-cijferige code naar je e-mail gestuurd.',
+                    'message' => 'Verificatiecode vereist. Bambu Lab heeft een 6-cijferige verificatiecode naar je e-mail gestuurd.',
                 ];
             }