Fix webinar registration redirecting to ladl.link/undefined.
Deploy Ladill Events / deploy (push) Successful in 29s
Deploy Ladill Events / deploy (push) Successful in 29s
Exempt public register POST from cross-site CSRF, collect email on the landing form, and handle API errors instead of navigating to a missing success_url. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -13,6 +13,11 @@ return Application::configure(basePath: dirname(__DIR__))
|
|||||||
health: '/up',
|
health: '/up',
|
||||||
)
|
)
|
||||||
->withMiddleware(function (Middleware $middleware): void {
|
->withMiddleware(function (Middleware $middleware): void {
|
||||||
|
// Public event registration is posted from ladl.link (cross-site); session CSRF cannot bind there.
|
||||||
|
$middleware->validateCsrfTokens(except: [
|
||||||
|
'q/*/register',
|
||||||
|
]);
|
||||||
|
|
||||||
$middleware->redirectGuestsTo(fn (Request $request) => route('sso.connect', [
|
$middleware->redirectGuestsTo(fn (Request $request) => route('sso.connect', [
|
||||||
'redirect' => $request->fullUrl(),
|
'redirect' => $request->fullUrl(),
|
||||||
]));
|
]));
|
||||||
|
|||||||
@@ -656,6 +656,7 @@
|
|||||||
if (!this.tier) { this.errorMsg = this.mode === 'contributions' ? 'Select a category.' : 'Select a ticket type.'; return; }
|
if (!this.tier) { this.errorMsg = this.mode === 'contributions' ? 'Select a category.' : 'Select a ticket type.'; return; }
|
||||||
if (this.mode === 'contributions' && !(parseFloat(this.amount) > 0)) { this.errorMsg = 'Enter a contribution amount.'; return; }
|
if (this.mode === 'contributions' && !(parseFloat(this.amount) > 0)) { this.errorMsg = 'Enter a contribution amount.'; return; }
|
||||||
if (!this.name.trim()) { this.errorMsg = 'Enter your full name.'; return; }
|
if (!this.name.trim()) { this.errorMsg = 'Enter your full name.'; return; }
|
||||||
|
if (!this.email.trim() || !this.email.includes('@')) { this.errorMsg = 'Enter a valid email address.'; return; }
|
||||||
if (!this.phone.trim()) { this.errorMsg = 'Enter your phone number.'; return; }
|
if (!this.phone.trim()) { this.errorMsg = 'Enter your phone number.'; return; }
|
||||||
this.errorMsg = ''; this.loading = true;
|
this.errorMsg = ''; this.loading = true;
|
||||||
try {
|
try {
|
||||||
@@ -664,11 +665,22 @@
|
|||||||
headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', 'X-CSRF-TOKEN': @js($evCsrf) },
|
headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', 'X-CSRF-TOKEN': @js($evCsrf) },
|
||||||
body: JSON.stringify({ tier: this.tier, amount: this.mode === 'contributions' ? this.amount : null, attendee_name: this.name, attendee_email: this.email, attendee_phone: this.phone, badge_fields: this.fields }),
|
body: JSON.stringify({ tier: this.tier, amount: this.mode === 'contributions' ? this.amount : null, attendee_name: this.name, attendee_email: this.email, attendee_phone: this.phone, badge_fields: this.fields }),
|
||||||
});
|
});
|
||||||
const data = await res.json();
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
this.errorMsg = data.error || data.message || 'Registration failed. Please try again.';
|
||||||
|
this.loading = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (data.error) { this.errorMsg = data.error; this.loading = false; return; }
|
if (data.error) { this.errorMsg = data.error; this.loading = false; return; }
|
||||||
if (!data.paid) { window.location.href = data.success_url; return; }
|
if (data.paid) {
|
||||||
if (window.innerWidth < 768) { this.checkoutUrl = data.checkout_url; this.showSheet = true; this.loading = false; }
|
if (!data.checkout_url) { this.errorMsg = 'Could not start checkout. Please try again.'; this.loading = false; return; }
|
||||||
else { window.location.href = data.checkout_url; }
|
if (window.innerWidth < 768) { this.checkoutUrl = data.checkout_url; this.showSheet = true; this.loading = false; }
|
||||||
|
else { window.location.href = data.checkout_url; }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (data.success_url) { window.location.href = data.success_url; return; }
|
||||||
|
this.errorMsg = 'Registration failed. Please try again.';
|
||||||
|
this.loading = false;
|
||||||
} catch(e) { this.errorMsg = 'Network error. Please try again.'; this.loading = false; }
|
} catch(e) { this.errorMsg = 'Network error. Please try again.'; this.loading = false; }
|
||||||
}
|
}
|
||||||
}" class="min-h-screen bg-slate-50 pb-12">
|
}" class="min-h-screen bg-slate-50 pb-12">
|
||||||
@@ -887,6 +899,8 @@
|
|||||||
<p class="text-[10px] font-bold uppercase tracking-widest" style="color:{{ $evColor }}">Your details</p>
|
<p class="text-[10px] font-bold uppercase tracking-widest" style="color:{{ $evColor }}">Your details</p>
|
||||||
<input type="text" x-model="name" placeholder="Full name *" autocomplete="name"
|
<input type="text" x-model="name" placeholder="Full name *" autocomplete="name"
|
||||||
class="w-full rounded-xl border border-slate-200 px-4 py-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1">
|
class="w-full rounded-xl border border-slate-200 px-4 py-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1">
|
||||||
|
<input type="email" x-model="email" placeholder="Email address *" autocomplete="email"
|
||||||
|
class="w-full rounded-xl border border-slate-200 px-4 py-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1">
|
||||||
<input type="tel" x-model="phone" placeholder="Phone number *" autocomplete="tel"
|
<input type="tel" x-model="phone" placeholder="Phone number *" autocomplete="tel"
|
||||||
class="w-full rounded-xl border border-slate-200 px-4 py-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1">
|
class="w-full rounded-xl border border-slate-200 px-4 py-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1">
|
||||||
@foreach($evFields as $field)
|
@foreach($evFields as $field)
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\QrCode;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Support\LadillLink;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class EventRegistrationTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
Http::fake([
|
||||||
|
config('billing.api_url').'/balance*' => Http::response(['balance_minor' => 50000]),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_free_registration_returns_success_url_without_session_cookie(): void
|
||||||
|
{
|
||||||
|
config(['link.public_domain' => 'ladl.link']);
|
||||||
|
|
||||||
|
$owner = User::create([
|
||||||
|
'public_id' => 'usr_reg_free',
|
||||||
|
'name' => 'Event Owner',
|
||||||
|
'email' => 'owner-reg-free@example.com',
|
||||||
|
]);
|
||||||
|
|
||||||
|
QrCode::create([
|
||||||
|
'user_id' => $owner->id,
|
||||||
|
'short_code' => 'webinar-demo',
|
||||||
|
'type' => QrCode::TYPE_EVENT,
|
||||||
|
'label' => 'Product webinar',
|
||||||
|
'payload' => [
|
||||||
|
'content' => [
|
||||||
|
'name' => 'Product webinar',
|
||||||
|
'mode' => 'free',
|
||||||
|
'format' => 'virtual',
|
||||||
|
'registration_open' => true,
|
||||||
|
'tiers' => [['name' => 'Registration', 'price' => 0, 'capacity' => 0]],
|
||||||
|
'virtual_sessions' => [
|
||||||
|
['join_url' => 'https://meet.ladill.com/r/demo-room'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
'style' => [],
|
||||||
|
],
|
||||||
|
'is_active' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response = $this->postJson('/q/webinar-demo/register', [
|
||||||
|
'tier' => 'Registration',
|
||||||
|
'attendee_name' => 'Jane Doe',
|
||||||
|
'attendee_email' => 'jane@example.com',
|
||||||
|
'attendee_phone' => '+233200000000',
|
||||||
|
], [
|
||||||
|
'X-Ladill-Internal' => '1',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertOk()
|
||||||
|
->assertJsonPath('paid', false)
|
||||||
|
->assertJsonStructure(['success_url', 'badge_code']);
|
||||||
|
|
||||||
|
$this->assertStringStartsWith(
|
||||||
|
LadillLink::path('webinar-demo', 'registered/'),
|
||||||
|
(string) $response->json('success_url')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user