soeren/fotospiel-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

change role to "user" for new registrations, fixed some registration form errors and implemented a reg-test

Browse Source
This commit is contained in:
Codex Agent
2025-10-02 15:06:50 +02:00
parent 7475210893
commit 1845d83583
13 changed files with 416 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Api/StripeWebhookController.php
View File

@@ -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

74
app/Http/Controllers/Auth/MarketingRegisterController.php
View File

@@ -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'));
}
}
}

31
app/Http/Controllers/Auth/RegisteredUserController.php
View File

@@ -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'));
}
}

7
app/Http/Controllers/PayPalWebhookController.php
View File

@@ -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,