isaacclad/ladill-meet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix meeting join links pointing at the Care domain.
Deploy Ladill Meet / deploy (push) Successful in 43s
Details

Browse Source 
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 <cursoragent@cursor.com>
This commit is contained in:
isaacclad
2026-07-01 10:32:02 +00:00
co-authored by Cursor
parent 4cc4970916
commit 08c4974a31
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DEPLOY.md
+2 -1
View File
@@ -50,7 +50,8 @@ Copy `.env.example`, set production values:
| Variable | Notes | | Variable | Notes |
|----------|-------| |----------|-------|
| `APP_KEY` | `php artisan key:generate --show` | | `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 | | `DB_*` | MySQL `ladill_care` credentials |
| `LADILL_SSO_CLIENT_ID` / `LADILL_SSO_CLIENT_SECRET` | Passport client (plain text from `passport:client`) | | `LADILL_SSO_CLIENT_ID` / `LADILL_SSO_CLIENT_SECRET` | Passport client (plain text from `passport:client`) |
| `BILLING_API_KEY_CARE` | Same as monolith consumer key | | `BILLING_API_KEY_CARE` | Same as monolith consumer key |
app/Models/Room.php
+1 -1
View File
@@ -113,6 +113,6 @@ class Room extends Model
public function joinUrl(): string public function joinUrl(): string
{ {
return url('/r/'.$this->uuid); return rtrim((string) config('app.meet_url', 'https://meet.ladill.com'), '/').'/r/'.$this->uuid;
} }
} }
config/app.php
+2 -1
View File
@@ -127,6 +127,7 @@ return [
'platform_domain' => env('PLATFORM_DOMAIN', parse_url((string) env('PLATFORM_URL', 'https://ladill.com'), PHP_URL_HOST) ?: 'ladill.com'), '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')), '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')), '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')),
]; ];
config/services.php
+1 -1
View File
@@ -21,7 +21,7 @@ return [
'issuer' => 'https://'.config('app.auth_domain'), 'issuer' => 'https://'.config('app.auth_domain'),
'client_id' => env('LADILL_SSO_CLIENT_ID'), 'client_id' => env('LADILL_SSO_CLIENT_ID'),
'client_secret' => env('LADILL_SSO_CLIENT_SECRET'), '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/*), // Central Ladill identity API (auth.ladill.com /api/identity/auth/*),
phpunit.xml
+1 -1
View File
@@ -19,7 +19,7 @@
</source> </source>
<php> <php>
<env name="APP_KEY" value="base64:2fl+KtvkdphvQyEfm3qXz2Bdm5fH3IOx4EoZ5/R4eJE="/> <env name="APP_KEY" value="base64:2fl+KtvkdphvQyEfm3qXz2Bdm5fH3IOx4EoZ5/R4eJE="/>
<env name="APP_URL" value="https://care.ladill.com"/> <env name="APP_URL" value="https://meet.ladill.com"/>
<env name="APP_ENV" value="testing"/> <env name="APP_ENV" value="testing"/>
<env name="APP_MAINTENANCE_DRIVER" value="file"/> <env name="APP_MAINTENANCE_DRIVER" value="file"/>
<env name="BCRYPT_ROUNDS" value="4"/> <env name="BCRYPT_ROUNDS" value="4"/>
tests/Feature/MeetWebTest.php
+1 -1
View File
@@ -161,7 +161,7 @@ class MeetWebTest extends TestCase
'settings' => config('meet.default_settings'), '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 public function test_user_can_view_recordings_index(): void