diff --git a/app/Http/Controllers/Api/Auth/OAuthController.php b/app/Http/Controllers/Api/Auth/OAuthController.php index 8458f664c..422358076 100644 --- a/app/Http/Controllers/Api/Auth/OAuthController.php +++ b/app/Http/Controllers/Api/Auth/OAuthController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Api\Auth; use App\Models\User\User; +use Illuminate\Support\Str; use Illuminate\Http\Request; use function Safe\json_decode; use Illuminate\Http\JsonResponse; @@ -190,7 +191,7 @@ class OAuthController extends Controller */ private function proxy(array $data = []): array { - $url = App::runningUnitTests() ? config('app.url').'/oauth/token' : route('passport.token'); + $url = App::runningUnitTests() ? Str::of(config('app.url'))->ltrim('/').'/oauth/token' : route('passport.token'); /** @var \Illuminate\Http\Response */ $response = app(Kernel::class)->handle(Request::create($url, 'POST', [ 'grant_type' => $data['grantType'], diff --git a/app/Notifications/EmailMessaging.php b/app/Notifications/EmailMessaging.php index 699a6c84c..0429ab1f0 100644 --- a/app/Notifications/EmailMessaging.php +++ b/app/Notifications/EmailMessaging.php @@ -3,6 +3,7 @@ namespace App\Notifications; use App\Models\User\User; +use Illuminate\Support\Str; use Illuminate\Support\Facades\App; use Illuminate\Notifications\Messages\MailMessage; @@ -40,7 +41,7 @@ class EmailMessaging ->subject(trans('mail.password_reset_title')) ->line(trans('mail.password_reset_title')) ->line(trans('mail.password_reset_intro')) - ->action(trans('mail.password_reset_button'), url(config('app.url').route('password.reset', ['token' => $token, 'email' => $user->getEmailForPasswordReset()], false))) + ->action(trans('mail.password_reset_button'), url(Str::of(config('app.url'))->ltrim('/').route('password.reset', ['token' => $token, 'email' => $user->getEmailForPasswordReset()], false))) ->line(trans('mail.password_reset_expiration', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')])) ->line(trans('mail.password_reset_bottom')); } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 664e6afea..10d7d2e31 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use Illuminate\Support\Str; use Illuminate\Routing\Router; use App\Models\Contact\Contact; use App\Services\Instance\IdHasher; @@ -35,7 +36,7 @@ class RouteServiceProvider extends ServiceProvider parent::boot(); if (Config::get('app.force_url')) { - URL::forceRootUrl(config('app.url')); + URL::forceRootUrl(Str::of(config('app.url'))->ltrim('/')); } if (App::environment('production')) { diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index deec4a1f4..2e0102004 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -1,7 +1,7 @@ @component('mail::layout') {{-- Header --}} @slot('header') -@component('mail::header', ['url' => config('app.url')]) +@component('mail::header', ['url' => Str::of(config('app.url'))->ltrim('/')]) {{ config('app.name') }} @endcomponent @endslot diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php index 1ae9ed8f1..9c0520bae 100644 --- a/resources/views/vendor/mail/text/message.blade.php +++ b/resources/views/vendor/mail/text/message.blade.php @@ -1,7 +1,7 @@ @component('mail::layout') {{-- Header --}} @slot('header') - @component('mail::header', ['url' => config('app.url')]) + @component('mail::header', ['url' => Str::of(config('app.url'))->ltrim('/')]) {{ config('app.name') }} @endcomponent @endslot