diff --git a/app/Http/Middleware/RedirectLegacyQrToLadillLink.php b/app/Http/Middleware/RedirectLegacyQrToLadillLink.php new file mode 100644 index 0000000..3e3d799 --- /dev/null +++ b/app/Http/Middleware/RedirectLegacyQrToLadillLink.php @@ -0,0 +1,24 @@ +path(), '/'))) { + return $next($request); + } + + if (LadillLink::isInternalRequest($request)) { + return $next($request); + } + + return LadillLink::legacyRedirect($request); + } +} diff --git a/app/Services/Mini/MiniPaymentService.php b/app/Services/Mini/MiniPaymentService.php index 0e371ce..5a72932 100644 --- a/app/Services/Mini/MiniPaymentService.php +++ b/app/Services/Mini/MiniPaymentService.php @@ -9,6 +9,7 @@ use App\Services\Billing\PaystackService; use App\Services\Billing\SmsService; use App\Services\Notifications\MiniNotificationService; use App\Services\Pay\PayClient; +use App\Support\LadillLink; use Illuminate\Support\Str; use RuntimeException; @@ -62,7 +63,7 @@ class MiniPaymentService 'fee_tier' => 'payments', 'source_service' => 'mini', 'source_ref' => (string) $qrCode->id, - 'callback_url' => route('qr.public.payment.callback', ['shortCode' => $qrCode->short_code]), + 'callback_url' => LadillLink::path($qrCode->short_code, 'pay/callback'), 'line_items' => [ [ 'name' => $businessName, diff --git a/app/Support/LadillLink.php b/app/Support/LadillLink.php index 3a51bc0..d29e89e 100644 --- a/app/Support/LadillLink.php +++ b/app/Support/LadillLink.php @@ -2,11 +2,16 @@ namespace App\Support; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; + /** * Canonical short-link URLs for the Ladill platform (ladl.link). */ final class LadillLink { + public const INTERNAL_HEADER = 'X-Ladill-Internal'; + public static function baseUrl(): string { $domain = (string) config('link.public_domain', 'ladl.link'); @@ -23,4 +28,33 @@ final class LadillLink { return self::url($slug).'/'.ltrim($suffix, '/'); } + + public static function isInternalRequest(Request $request): bool + { + return $request->header(self::INTERNAL_HEADER) === '1'; + } + + public static function legacyRedirect(Request $request): RedirectResponse + { + $shortCode = $request->route('shortCode'); + if (! is_string($shortCode) || $shortCode === '') { + abort(404); + } + + $path = ltrim($request->path(), '/'); + $prefix = 'q/'.$shortCode; + $suffix = ''; + if ($path !== $prefix && str_starts_with($path, $prefix.'/')) { + $suffix = substr($path, strlen($prefix) + 1); + } + + $target = $suffix === '' ? self::url($shortCode) : self::path($shortCode, $suffix); + if ($qs = $request->getQueryString()) { + $target .= '?'.$qs; + } + + $status = in_array($request->method(), ['GET', 'HEAD'], true) ? 301 : 307; + + return redirect()->away($target, $status); + } } diff --git a/bootstrap/app.php b/bootstrap/app.php index 2e2ca96..a32e4a0 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -22,6 +22,7 @@ return Application::configure(basePath: dirname(__DIR__)) ]); $middleware->alias([ 'platform.session' => \App\Http\Middleware\EnsurePlatformSession::class, + 'redirect.legacy.qr' => \App\Http\Middleware\RedirectLegacyQrToLadillLink::class, ]); }) ->withExceptions(function (Exceptions $exceptions): void { diff --git a/routes/web.php b/routes/web.php index 47a95ae..10c762d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -31,10 +31,12 @@ Route::get('/sso/logout-frontchannel', [SsoLoginController::class, 'frontchannel Route::get('/sso/platform-signed-out', [SsoLoginController::class, 'platformSignedOut'])->name('sso.platform-signed-out'); Route::get('/signed-out', fn () => auth()->check() ? redirect()->route('mini.dashboard') : view('mini.signed-out'))->name('mini.signed-out'); +Route::middleware('redirect.legacy.qr')->group(function () { Route::get('/q/{shortCode}', [QrScanController::class, 'resolve'])->name('qr.public.resolve'); Route::get('/q/{shortCode}/payment-logo', [QrScanController::class, 'paymentLogo'])->name('qr.public.payment.logo'); Route::post('/q/{shortCode}/pay', [PaymentController::class, 'pay'])->name('qr.public.payment.pay'); Route::get('/q/{shortCode}/pay/callback', [PaymentController::class, 'callback'])->name('qr.public.payment.callback'); +}); Route::middleware(['auth', 'platform.session'])->group(function () { Route::get('/wallet/balance', [WalletBalanceController::class, 'balance'])->name('wallet.balance');