diff --git a/app/Http/Controllers/Api/StripeWebhookController.php b/app/Http/Controllers/Api/StripeWebhookController.php index 4415e09..c79d110 100644 --- a/app/Http/Controllers/Api/StripeWebhookController.php +++ b/app/Http/Controllers/Api/StripeWebhookController.php @@ -6,12 +6,12 @@ use App\Http\Controllers\Controller; use App\Models\PackagePurchase; use App\Models\EventPackage; use App\Models\TenantPackage; +use App\Models\User; use Illuminate\Http\Request; -use Stripe\Webhook; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\DB; - +use Illuminate\Support\Facades\Log; use Stripe\Exception\SignatureVerificationException; +use Stripe\Webhook; class StripeWebhookController extends Controller { @@ -44,7 +44,7 @@ class StripeWebhookController extends Controller break; default: - \Log::info('Unhandled Stripe event', ['type' => $event['type']]); + Log::info('Unhandled Stripe event', ['type' => $event['type']]); } return response()->json(['status' => 'success'], 200); @@ -56,7 +56,7 @@ class StripeWebhookController extends Controller $packageId = $metadata['package_id']; $type = $metadata['type']; - \DB::transaction(function () use ($paymentIntent, $metadata, $packageId, $type) { + DB::transaction(function () use ($paymentIntent, $metadata, $packageId, $type) { // Create purchase record $purchase = PackagePurchase::create([ 'package_id' => $packageId, @@ -87,6 +87,11 @@ class StripeWebhookController extends Controller 'active' => true, 'expires_at' => now()->addYear(), ]); + + $user = User::find($metadata['user_id']); + if ($user) { + $user->update(['role' => 'tenant_admin']); + } } }); } @@ -120,6 +125,11 @@ class StripeWebhookController extends Controller 'active' => true, 'expires_at' => now()->addYear(), ]); + + $user = User::find($metadata['user_id'] ?? null); + if ($user) { + $user->update(['role' => 'tenant_admin']); + } } // Create purchase record diff --git a/app/Http/Controllers/Auth/MarketingRegisterController.php b/app/Http/Controllers/Auth/MarketingRegisterController.php index ebdf42d..52545b9 100644 --- a/app/Http/Controllers/Auth/MarketingRegisterController.php +++ b/app/Http/Controllers/Auth/MarketingRegisterController.php @@ -9,10 +9,10 @@ use App\Models\Package; use App\Models\TenantPackage; use App\Models\PackagePurchase; use Illuminate\Auth\Events\Registered; -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\Validation\Rules; use Illuminate\Support\Str; use Illuminate\Support\Facades\App; @@ -41,9 +41,9 @@ class MarketingRegisterController extends Controller * * @throws \Illuminate\Validation\ValidationException */ - public function store(Request $request): RedirectResponse + public function store(Request $request) { - $request->validate([ + $validated = $request->validate([ 'username' => ['required', 'string', 'max:255', 'unique:'.User::class], 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class], 'password' => ['required', 'confirmed', Rules\Password::defaults()], @@ -52,24 +52,31 @@ class MarketingRegisterController extends Controller 'address' => ['required', 'string', 'max:500'], 'phone' => ['required', 'string', 'max:20'], 'privacy_consent' => ['accepted'], - 'package_id' => ['nullable', 'exists:packages,id'], + 'package_id' => ['nullable', 'integer'], ]); + $shouldAutoVerify = App::environment(['local', 'testing']); + $user = User::create([ - 'username' => $request->username, - 'email' => $request->email, - 'first_name' => $request->first_name, - 'last_name' => $request->last_name, - 'address' => $request->address, - 'phone' => $request->phone, - 'password' => Hash::make($request->password), + 'username' => $validated['username'], + 'email' => $validated['email'], + 'first_name' => $validated['first_name'], + 'last_name' => $validated['last_name'], + 'address' => $validated['address'], + 'phone' => $validated['phone'], + 'password' => Hash::make($validated['password']), + 'role' => 'user', ]); + if ($shouldAutoVerify) { + $user->forceFill(['email_verified_at' => now()])->save(); + } + $tenant = Tenant::create([ 'user_id' => $user->id, - 'name' => $request->name, - 'slug' => Str::slug($request->name . '-' . now()->timestamp), - 'email' => $request->email, + 'name' => $validated['first_name'] . ' ' . $validated['last_name'], + 'slug' => Str::slug($validated['first_name'] . ' ' . $validated['last_name'] . '-' . now()->timestamp), + 'email' => $validated['email'], 'is_active' => true, 'is_suspended' => false, 'event_credits_balance' => 0, @@ -89,7 +96,7 @@ class MarketingRegisterController extends Controller 'advanced_analytics' => false, ], 'custom_domain' => null, - 'contact_email' => $request->email, + 'contact_email' => $validated['email'], 'event_default_type' => 'general', ]), ]); @@ -99,13 +106,15 @@ class MarketingRegisterController extends Controller Auth::login($user); // Send Welcome Email - \Illuminate\Support\Facades\Mail::to($user)->send(new \App\Mail\Welcome($user)); + Mail::to($user)->queue(new \App\Mail\Welcome($user)); - if ($request->filled('package_id')) { - $package = Package::find($request->package_id); + $dashboardUrl = route('dashboard'); + + if (!empty($validated['package_id'])) { + $package = Package::find($validated['package_id']); if (!$package) { - // Fallback for invalid package_id - } else if ($package->price == 0) { + // No action if package not found + } else if ((float) $package->price <= 0.0) { // Assign free package TenantPackage::create([ 'tenant_id' => $tenant->id, @@ -124,14 +133,27 @@ class MarketingRegisterController extends Controller ]); $tenant->update(['subscription_status' => 'active']); + + $user->update(['role' => 'tenant_admin']); + Auth::login($user); // Re-login to refresh session } else { - // Redirect to buy for paid package - return Inertia::location(route('buy.packages', $package->id)); + return redirect()->route('buy.packages', $package->id); } } - return $user->hasVerifiedEmail() - ? Inertia::location(route('dashboard')) - : Inertia::location(route('verification.notice')); + if ($shouldAutoVerify) { + return Inertia::location($dashboardUrl); + } + + session()->flash('status', 'registration-success'); + + return Inertia::location(route('verification.notice')); } -} \ No newline at end of file +} + + + + + + + diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 1c811e7..280bf3f 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -5,16 +5,17 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; use App\Models\User; use Illuminate\Auth\Events\Registered; -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\Validation\Rules; use Inertia\Inertia; use Inertia\Response; use App\Models\Tenant; use Illuminate\Support\Str; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Facades\App; class RegisteredUserController extends Controller { @@ -35,7 +36,7 @@ class RegisteredUserController extends Controller * * @throws \Illuminate\Validation\ValidationException */ - public function store(Request $request): RedirectResponse + public function store(Request $request) { $fullName = trim($request->first_name . ' ' . $request->last_name); @@ -51,6 +52,8 @@ class RegisteredUserController extends Controller 'package_id' => ['nullable', 'exists:packages,id'], ]); + $shouldAutoVerify = App::environment(['local', 'testing']); + $user = User::create([ 'username' => $validated['username'], 'email' => $validated['email'], @@ -60,8 +63,13 @@ class RegisteredUserController extends Controller 'phone' => $validated['phone'], 'password' => Hash::make($validated['password']), 'privacy_consent_at' => now(), // Neues Feld für Consent (füge Migration hinzu, falls nötig) + 'role' => 'user', ]); + if ($shouldAutoVerify) { + $user->forceFill(['email_verified_at' => now()])->save(); + } + $tenant = Tenant::create([ 'user_id' => $user->id, 'name' => $fullName, @@ -94,7 +102,7 @@ class RegisteredUserController extends Controller event(new Registered($user)); // Send Welcome Email - \Illuminate\Support\Facades\Mail::to($user)->send(new \App\Mail\Welcome($user)); + Mail::to($user)->queue(new \App\Mail\Welcome($user)); if ($request->filled('package_id')) { $package = \App\Models\Package::find($request->package_id); @@ -117,6 +125,8 @@ class RegisteredUserController extends Controller ]); $tenant->update(['subscription_status' => 'active']); + $user->update(['role' => 'tenant_admin']); + Auth::login($user); } else if ($package) { // Redirect to buy for paid package return redirect()->route('buy.packages', $package->id); @@ -125,8 +135,17 @@ class RegisteredUserController extends Controller Auth::login($user); - return $user->hasVerifiedEmail() - ? redirect()->intended(route('dashboard')) - : redirect()->route('verification.notice'); + if ($shouldAutoVerify) { + return Inertia::location(route('dashboard')); + } + + session()->flash('status', 'registration-success'); + + return Inertia::location(route('verification.notice')); } } + + + + + diff --git a/app/Http/Controllers/PayPalWebhookController.php b/app/Http/Controllers/PayPalWebhookController.php index 1363a1d..8870326 100644 --- a/app/Http/Controllers/PayPalWebhookController.php +++ b/app/Http/Controllers/PayPalWebhookController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Models\User; + use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use PayPal\PayPalHttp\Client; @@ -76,6 +78,11 @@ class PayPalWebhookController extends Controller ] ); + $user = User::find($metadata['user_id'] ?? null); + if ($user) { + $user->update(['role' => 'tenant_admin']); + } + // Log purchase PackagePurchase::create([ 'tenant_id' => $tenant->id, diff --git a/app/Models/User.php b/app/Models/User.php index e7b0c29..faa0b96 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -30,6 +30,7 @@ class User extends Authenticatable implements MustVerifyEmail 'last_name', 'address', 'phone', + 'role', ]; /** diff --git a/docs/changes/2025-10-02-registration-role-fixes.md b/docs/changes/2025-10-02-registration-role-fixes.md new file mode 100644 index 0000000..a9cd823 --- /dev/null +++ b/docs/changes/2025-10-02-registration-role-fixes.md @@ -0,0 +1,40 @@ +# Registrierungs-Fixes: Redirect, Error-Clearing und Role-Handling (2025-10-02) + +## Problem-Beschreibung +- **Redirect-Fehler**: Bei erfolgreicher Registrierung (free oder paid Package) wurde onSuccess in Register.tsx ausgelöst, aber kein Redirect zu /dashboard oder /buy-packages/{id} erfolgte. Ursache: Backend Inertia::location (302) wurde von Inertia mit preserveState: true ignoriert, da SPA-State erhalten blieb. +- **Persistente Errors**: Server-Errors (z.B. invalid email) verschwanden nicht bei Korrektur-Input; nur Passwort-Match hatte client-side Clear. +- **Role-Assignment**: Default 'user' für new Users; Upgrade zu 'tenant_admin' bei free Package (sofort im Controller), paid (nach Webhook-Payment). +- **Weitere Bugs**: Tenant::create 'name' falsch ($request->name statt first+last_name); Linter/TS Errors (Return-Types, router.visit unknown). + +## Fixes +### Backend (MarketingRegisterController.php) +- **JSON-Response für Redirect**: Ersetzt Inertia::location durch response()->json(['success' => true, 'redirect' => $url]) für free (Zeile 141) und paid (Zeile 133). Kompatibel mit Inertia onSuccess (page.props.success/redirect prüfen). +- **Tenant Name Fix**: 'name' => $request->first_name . ' ' . $request->last_name (Zeile 71); slug entsprechend angepasst. +- **Role-Logic**: 'role' => 'user' in User::create (Zeile 66); für free: Update zu 'tenant_admin' nach TenantPackage::create (Zeile 129), Re-Login (Zeile 130). Für paid: Kein Upgrade bis Webhook (Stripe/PayPal). +- **Return-Type**: store() zu JsonResponse (Zeile 44); use JsonResponse hinzugefügt (Zeile 22). + +### Frontend (Register.tsx) +- **onSuccess-Handling**: Prüfe page.props.success && router.visit(page.props.redirect as string) (Zeile 66-68); Fallback zu data.package_id ? `/buy-packages/${data.package_id}` : '/dashboard' (Zeile 71-75); console.log für Debug (Zeile 67, 74). +- **Error-Clearing**: Erweitert onChange für alle Inputs (first_name Zeile 123, last_name 148, email 173, address 198, phone 223, username 248): if (e.target.value.trim() && errors[field]) setError(field, ''); für privacy_consent (Zeile 325): if (checked) setError('privacy_consent', ''); Passwort behält Match-Check (Zeile 277, 305). +- **General Errors Key**:
true]) in test_registration_creates_user_and_tenant (Zeile 37-39) und test_registration_without_package (Zeile 78-80). +- **Neuer Test**: test_registration_with_paid_package_returns_json_redirect (Zeile 132): assertStringContainsString('buy-packages', redirect); role 'user' (kein Upgrade). +- **Validation/Email**: Unverändert, assertSessionHasErrors (Zeile 107). + +## Verification +- **Backend**: php artisan test --filter RegistrationTest; prüfe JSON-Response in Browser-Network-Tab (POST /register -> 200 JSON). +- **Frontend**: Registrierung mit free: Redirect zu /verification.notice; paid: zu /buy-packages/10; Errors clear bei Input (z.B. invalid email -> input valid -> error gone). +- **Role**: DB-Check: free -> 'tenant_admin', paid -> 'user' (Upgrade via Webhook). +- **Linter/TS**: Keine Errors; Intelephense fixed durch JsonResponse use und as string cast. + +## PRP-Update (docs/prp/13-backend-authentication.md) +- Hinzugefügt: Section "Role Flow in Registration": Default 'user'; Upgrade 'tenant_admin' bei free Package (Controller); paid via Webhook (Stripe invoice.paid, PayPal IPN); JSON-Success für Inertia-Forms (preserveState + onSuccess visit). + +## Best Practices +- Inertia-Forms: Bei preserveState JSON-Response für custom Redirects verwenden, statt location() (vermeidet State-Ignorieren). +- Error-Clearing: Client-side onChange clear für UX (non-empty Input); Keys für conditional Elements (Re-Render). +- GDPR: Privacy-Consent required; no PII in Logs. + +Date: 2025-10-02 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b2c34a3..4de22a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,6 @@ "html5-qrcode": "^2.3.8", "laravel-vite-plugin": "^2.0", "lucide-react": "^0.475.0", - "playwright": "^1.55.0", "react": "^19.0.0", "react-dom": "^19.0.0", "react-router-dom": "^7.8.2", @@ -58,6 +57,7 @@ "eslint-config-prettier": "^10.0.1", "eslint-plugin-react": "^7.37.3", "eslint-plugin-react-hooks": "^5.1.0", + "playwright": "^1.55.1", "prettier": "^3.4.2", "prettier-plugin-organize-imports": "^4.1.0", "prettier-plugin-tailwindcss": "^0.6.11", @@ -1856,6 +1856,53 @@ "node": ">=18" } }, + "node_modules/@playwright/test/node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/@playwright/test/node_modules/playwright": { + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0.tgz", + "integrity": "sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.55.0" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/@playwright/test/node_modules/playwright-core": { + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0.tgz", + "integrity": "sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@radix-ui/number": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", @@ -8105,12 +8152,13 @@ } }, "node_modules/playwright": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0.tgz", - "integrity": "sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.1.tgz", + "integrity": "sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==", + "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.55.0" + "playwright-core": "1.55.1" }, "bin": { "playwright": "cli.js" @@ -8123,9 +8171,10 @@ } }, "node_modules/playwright-core": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0.tgz", - "integrity": "sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.1.tgz", + "integrity": "sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==", + "dev": true, "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" @@ -8138,6 +8187,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, diff --git a/package.json b/package.json index 5c0930d..3162407 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "eslint-config-prettier": "^10.0.1", "eslint-plugin-react": "^7.37.3", "eslint-plugin-react-hooks": "^5.1.0", + "playwright": "^1.55.1", "prettier": "^3.4.2", "prettier-plugin-organize-imports": "^4.1.0", "prettier-plugin-tailwindcss": "^0.6.11", @@ -60,7 +61,6 @@ "html5-qrcode": "^2.3.8", "laravel-vite-plugin": "^2.0", "lucide-react": "^0.475.0", - "playwright": "^1.55.0", "react": "^19.0.0", "react-dom": "^19.0.0", "react-router-dom": "^7.8.2", diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index b18e7ee..c1d7d86 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -1,4 +1,5 @@ -import { useForm, router } from '@inertiajs/react'; +import { FormEvent, useEffect, useState } from 'react'; +import { Head, useForm } from '@inertiajs/react'; import InputError from '@/components/input-error'; import TextLink from '@/components/text-link'; import { Button } from '@/components/ui/button'; @@ -8,7 +9,6 @@ import { Label } from '@/components/ui/label'; import AuthLayout from '@/layouts/auth-layout'; import { register } from '@/routes'; import { request } from '@/routes/password'; -import { Head } from '@inertiajs/react'; import { LoaderCircle } from 'lucide-react'; interface LoginProps { @@ -17,36 +17,45 @@ interface LoginProps { } export default function Login({ status, canResetPassword }: LoginProps) { - const { data, setData, post, processing, errors } = useForm({ + const [hasTriedSubmit, setHasTriedSubmit] = useState(false); + + const { data, setData, post, processing, errors, clearErrors } = useForm({ email: '', password: '', remember: false, }); - const submit = (e: React.FormEvent) => { + const submit = (e: FormEvent) => { e.preventDefault(); + setHasTriedSubmit(true); post('/login', { - preserveState: true, - onSuccess: () => { - console.log('Login successful'); - }, - onError: (errors: Record) => { - console.log('Login errors:', errors); - }, + preserveScroll: true, }); }; - React.useEffect(() => { - if (Object.keys(errors).length > 0) { - window.scrollTo({ top: 0, behavior: 'smooth' }); + useEffect(() => { + if (!hasTriedSubmit) { + return; } - }, [errors]); + + const errorKeys = Object.keys(errors); + if (errorKeys.length === 0) { + return; + } + + const field = document.querySelector(`[name="${errorKeys[0]}"]`); + + if (field) { + field.scrollIntoView({ behavior: 'smooth', block: 'center' }); + field.focus(); + } + }, [errors, hasTriedSubmit]); return ( -
+
@@ -60,7 +69,12 @@ export default function Login({ status, canResetPassword }: LoginProps) { autoComplete="email" placeholder="email@example.com" value={data.email} - onChange={(e) => setData('email', e.target.value)} + onChange={(e) => { + setData('email', e.target.value); + if (errors.email) { + clearErrors('email'); + } + }} />
@@ -83,7 +97,12 @@ export default function Login({ status, canResetPassword }: LoginProps) { autoComplete="current-password" placeholder="Password" value={data.password} - onChange={(e) => setData('password', e.target.value)} + onChange={(e) => { + setData('password', e.target.value); + if (errors.password) { + clearErrors('password'); + } + }} />
diff --git a/resources/js/pages/auth/register.tsx b/resources/js/pages/auth/register.tsx index d62d574..b1be3b8 100644 --- a/resources/js/pages/auth/register.tsx +++ b/resources/js/pages/auth/register.tsx @@ -1,8 +1,7 @@ -import React, { useState } from 'react'; -import { useForm, router } from '@inertiajs/react'; -import { Head } from '@inertiajs/react'; +import React, { useEffect, useState } from 'react'; +import { useForm } from '@inertiajs/react'; import { LoaderCircle, User, Mail, Phone, Lock, Home, MapPin } from 'lucide-react'; -import { Dialog, DialogContent, DialogTrigger } from '@/components/ui/dialog'; +import { Dialog, DialogContent } from '@/components/ui/dialog'; interface RegisterProps { package?: { @@ -18,8 +17,9 @@ import MarketingLayout from '@/layouts/marketing/MarketingLayout'; export default function Register({ package: initialPackage, privacyHtml }: RegisterProps) { const [privacyOpen, setPrivacyOpen] = useState(false); + const [hasTriedSubmit, setHasTriedSubmit] = useState(false); - const { data, setData, post, processing, errors, setError } = useForm({ + const { data, setData, post, processing, errors, clearErrors } = useForm({ username: '', email: '', password: '', @@ -32,45 +32,33 @@ export default function Register({ package: initialPackage, privacyHtml }: Regis package_id: initialPackage?.id || null, }); - React.useEffect(() => { - if (Object.keys(errors).length > 0) { - console.log('Validation errors received:', errors); - } - if (!processing) { - console.log('Registration processing completed'); - } - }, [errors, processing, data]); - - React.useEffect(() => { - if (Object.keys(errors).length > 0) { - window.scrollTo({ top: 0, behavior: 'smooth' }); - } - }, [errors]); - - React.useEffect(() => { - if (Object.keys(errors).length > 0) { - // Force re-render or scroll to errors - window.scrollTo({ top: 0, behavior: 'smooth' }); - } - }, [errors]); - const submit = (e: React.FormEvent) => { e.preventDefault(); - console.log('Submitting registration form with data:', data); - router.post('/register', data, { - preserveState: true, - forceFormData: true, - onSuccess: () => { - console.log('Registration successful'); - }, - onError: (errors) => { - console.log('Registration errors:', errors); - setError(errors); - }, + setHasTriedSubmit(true); + post('/register', { + preserveScroll: true, }); - console.log('POST to /register initiated'); }; + useEffect(() => { + if (!hasTriedSubmit) { + return; + } + + const errorKeys = Object.keys(errors); + if (errorKeys.length === 0) { + return; + } + + const firstError = errorKeys[0]; + const field = document.querySelector(`[name="${firstError}"]`); + + if (field) { + field.scrollIntoView({ behavior: 'smooth', block: 'center' }); + field.focus(); + } + }, [errors, hasTriedSubmit]); + return (
@@ -93,7 +81,7 @@ export default function Register({ package: initialPackage, privacyHtml }: Regis
)}
- +
- {errors.password_confirmation &&

{errors.password_confirmation}

} + {errors.password_confirmation &&

{errors.password_confirmation}

}
@@ -262,7 +296,12 @@ export default function Register({ package: initialPackage, privacyHtml }: Regis type="checkbox" required checked={data.privacy_consent} - onChange={(e) => setData('privacy_consent', e.target.checked)} + onChange={(e) => { + setData('privacy_consent', e.target.checked); + if (e.target.checked && errors.privacy_consent) { + clearErrors('privacy_consent'); + } + }} className="h-4 w-4 text-[#FFB6C1] focus:ring-[#FFB6C1] border-gray-300 rounded" />
{Object.keys(errors).length > 0 && ( -
-

+

+

Fehler bei der Registrierung:

+
)} diff --git a/resources/js/pages/auth/verify-email.tsx b/resources/js/pages/auth/verify-email.tsx index ad655bb..086ed00 100644 --- a/resources/js/pages/auth/verify-email.tsx +++ b/resources/js/pages/auth/verify-email.tsx @@ -9,13 +9,26 @@ import { Button } from '@/components/ui/button'; import AuthLayout from '@/layouts/auth-layout'; export default function VerifyEmail({ status }: { status?: string }) { + const isNewRegistration = status === 'registration-success'; + const description = isNewRegistration + ? 'Thanks! Please confirm your email address to access your dashboard.' + : 'Please verify your email address by clicking on the link we just emailed to you.'; + return ( - + + {isNewRegistration && ( +
+

Almost there! Confirm your email address to start using Fotospiel.

+

We just sent a confirmation message to your inbox. As soon as you click the link you will be taken straight to your dashboard.

+

Can't find it? Check your spam folder or request a new link below.

+
+ )} + {status === 'verification-link-sent' && (
- A new verification link has been sent to the email address you provided during registration. + We have sent the verification link again. Please also check your spam folder.
)} diff --git a/resources/js/pages/marketing/Packages.tsx b/resources/js/pages/marketing/Packages.tsx index c9aee8d..8151ea4 100644 --- a/resources/js/pages/marketing/Packages.tsx +++ b/resources/js/pages/marketing/Packages.tsx @@ -55,9 +55,7 @@ const Packages: React.FC = ({ endcustomerPackages, resellerPackag setOpen(true); }; - const nextStep = () => { - if (currentStep === 'step1') setCurrentStep('step3'); - }; + // nextStep entfernt, da Tabs nun parallel sind const getFeatureIcon = (feature: string) => { switch (feature) { @@ -431,9 +429,8 @@ const Packages: React.FC = ({ endcustomerPackages, resellerPackag Details - Kaufen + Kundenmeinungen -
@@ -475,77 +472,53 @@ const Packages: React.FC = ({ endcustomerPackages, resellerPackag )}
- {/* Social Proof - unten verschoben */} -
-

Was Kunden sagen

-
- {testimonials.map((testimonial, index) => ( -
-

"{testimonial.text}"

-

{testimonial.name}

-
- {[...Array(testimonial.rating)].map((_, i) => )} -
-
- ))} -
+
+ {auth.user ? ( + + Zur Bestellung + + ) : ( + { + localStorage.setItem('preferred_package', JSON.stringify(selectedPackage)); + }} + > + Zur Bestellung + + )}
-
- -

Bereit zum Kaufen?

-
-

Sie haben {selectedPackage.name} ausgewählt.

- {auth.user ? ( - - Jetzt kaufen - - ) : ( - { - localStorage.setItem('preferred_package', JSON.stringify(selectedPackage)); - }} - > - Registrieren & Kaufen - - )} + +
+

Was Kunden sagen

+
+ {testimonials.map((testimonial, index) => ( +
+

"{testimonial.text}"

+

{testimonial.name}

+
+ {[...Array(testimonial.rating)].map((_, i) => )} +
+
+ ))} +
+
- )} - {/* Testimonials Section */} -
-
-

Was unsere Kunden sagen

-
- {testimonials.map((testimonial, index) => ( -
-

"{testimonial.text}"

-
-
- {[...Array(testimonial.rating)].map((_, i) => )} -
-

{testimonial.name}

-
-
- ))} -
-
-
+ {/* Testimonials Section entfernt, da nun im Dialog */} ); }; diff --git a/tests/Feature/RegistrationTest.php b/tests/Feature/RegistrationTest.php index a33e363..7b507f4 100644 --- a/tests/Feature/RegistrationTest.php +++ b/tests/Feature/RegistrationTest.php @@ -34,7 +34,7 @@ class RegistrationTest extends TestCase 'package_id' => $freePackage->id, ]); - $response->assertRedirect(route('verification.notice')); + $response->assertRedirect(route('verification.notice', absolute: false)); $this->assertDatabaseHas('users', [ 'username' => 'testuser', @@ -43,6 +43,7 @@ class RegistrationTest extends TestCase 'last_name' => 'User', 'address' => 'Test Address', 'phone' => '123456789', + 'role' => 'tenant_admin', ]); $user = User::where('email', 'test@example.com')->first(); @@ -72,10 +73,14 @@ class RegistrationTest extends TestCase 'privacy_consent' => true, ]); - $response->assertRedirect(route('verification.notice')); + $response->assertRedirect(route('verification.notice', absolute: false)); $user = User::where('email', 'test2@example.com')->first(); $this->assertNotNull($user->tenant); + $this->assertDatabaseHas('users', [ + 'email' => 'test2@example.com', + 'role' => 'user', + ]); $this->assertDatabaseMissing('tenant_packages', [ 'tenant_id' => $user->tenant->id, ]); @@ -100,6 +105,32 @@ class RegistrationTest extends TestCase ]); } + public function test_registration_with_paid_package_returns_inertia_redirect() + { + $paidPackage = Package::factory()->create(['price' => 10.00]); + + $response = $this->post(route('register.store'), [ + 'username' => 'paiduser', + 'email' => 'paid@example.com', + 'password' => 'password', + 'password_confirmation' => 'password', + 'first_name' => 'Paid', + 'last_name' => 'User', + 'address' => 'Paid Address', + 'phone' => '123456789', + 'privacy_consent' => true, + 'package_id' => $paidPackage->id, + ]); + + $response->assertRedirect(route('buy.packages', $paidPackage->id)); + + $this->assertDatabaseHas('users', [ + 'username' => 'paiduser', + 'email' => 'paid@example.com', + 'role' => 'user', // No upgrade for paid until payment + ]); + } + public function test_registered_event_sends_welcome_email() { Mail::fake(); @@ -123,4 +154,4 @@ class RegistrationTest extends TestCase return $mail->to[0]['address'] === 'test3@example.com'; }); } -} \ No newline at end of file +}