From 08c4974a310d4db4fc126fb26df74ed4afb1579b Mon Sep 17 00:00:00 2001 From: isaacclad Date: Wed, 1 Jul 2026 10:32:02 +0000 Subject: [PATCH] Fix meeting join links pointing at the Care domain. Build join URLs from meet.ladill.com config instead of APP_URL, which was still inherited from the Care app template. Co-authored-by: Cursor --- DEPLOY.md | 3 ++- app/Models/Room.php | 2 +- config/app.php | 3 ++- config/services.php | 2 +- phpunit.xml | 2 +- tests/Feature/MeetWebTest.php | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/DEPLOY.md b/DEPLOY.md index faf522e..7046d48 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -50,7 +50,8 @@ Copy `.env.example`, set production values: | Variable | Notes | |----------|-------| | `APP_KEY` | `php artisan key:generate --show` | -| `APP_URL` | `https://care.ladill.com` | +| `APP_URL` | `https://meet.ladill.com` | +| `MEET_URL` | Optional override for join links (defaults to `https://meet.ladill.com`) | | `DB_*` | MySQL `ladill_care` credentials | | `LADILL_SSO_CLIENT_ID` / `LADILL_SSO_CLIENT_SECRET` | Passport client (plain text from `passport:client`) | | `BILLING_API_KEY_CARE` | Same as monolith consumer key | diff --git a/app/Models/Room.php b/app/Models/Room.php index 8f1ce2f..b6f0048 100644 --- a/app/Models/Room.php +++ b/app/Models/Room.php @@ -113,6 +113,6 @@ class Room extends Model public function joinUrl(): string { - return url('/r/'.$this->uuid); + return rtrim((string) config('app.meet_url', 'https://meet.ladill.com'), '/').'/r/'.$this->uuid; } } diff --git a/config/app.php b/config/app.php index 6a83f43..d68c867 100644 --- a/config/app.php +++ b/config/app.php @@ -127,6 +127,7 @@ return [ 'platform_domain' => env('PLATFORM_DOMAIN', parse_url((string) env('PLATFORM_URL', 'https://ladill.com'), PHP_URL_HOST) ?: 'ladill.com'), 'auth_domain' => env('AUTH_DOMAIN', 'auth.'.(parse_url((string) env('PLATFORM_URL', 'https://ladill.com'), PHP_URL_HOST) ?: 'ladill.com')), 'account_domain' => env('ACCOUNT_DOMAIN', 'account.'.(parse_url((string) env('PLATFORM_URL', 'https://ladill.com'), PHP_URL_HOST) ?: 'ladill.com')), - 'meet_domain' => env('MEET_DOMAIN', parse_url((string) env('APP_URL', 'https://meet.ladill.com'), PHP_URL_HOST) ?: 'meet.ladill.com'), + 'meet_domain' => env('MEET_DOMAIN', 'meet.ladill.com'), + 'meet_url' => env('MEET_URL', 'https://'.env('MEET_DOMAIN', 'meet.ladill.com')), ]; diff --git a/config/services.php b/config/services.php index 5ad6df2..62bdc2f 100644 --- a/config/services.php +++ b/config/services.php @@ -21,7 +21,7 @@ return [ 'issuer' => 'https://'.config('app.auth_domain'), 'client_id' => env('LADILL_SSO_CLIENT_ID'), 'client_secret' => env('LADILL_SSO_CLIENT_SECRET'), - 'redirect' => rtrim((string) env('APP_URL', 'https://care.ladill.com'), '/').'/sso/callback', + 'redirect' => rtrim((string) env('APP_URL', 'https://meet.ladill.com'), '/').'/sso/callback', ], // Central Ladill identity API (auth.ladill.com /api/identity/auth/*), diff --git a/phpunit.xml b/phpunit.xml index 973fa99..b1b744c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -19,7 +19,7 @@ - + diff --git a/tests/Feature/MeetWebTest.php b/tests/Feature/MeetWebTest.php index a58734f..2c66d4a 100644 --- a/tests/Feature/MeetWebTest.php +++ b/tests/Feature/MeetWebTest.php @@ -161,7 +161,7 @@ class MeetWebTest extends TestCase 'settings' => config('meet.default_settings'), ]); - $this->assertStringContainsString($room->uuid, $room->joinUrl()); + $this->assertStringContainsString('meet.ladill.com/r/'.$room->uuid, $room->joinUrl()); } public function test_user_can_view_recordings_index(): void