Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed URL gen issue causing incorrect scheme to be used

Browse Source 
For #1613
This commit is contained in:
Dan Brown 2019-09-01 12:07:51 +01:00
parent f421a2e1d6
commit 7a4425473b
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Providers/AppServiceProvider.php
View File

@ -25,7 +25,12 @@ class AppServiceProvider extends ServiceProvider
public function boot() public function boot()
{ {
// Set root URL // Set root URL
URL::forceRootUrl(config('app.url')); $appUrl = config('app.url');
if ($appUrl) {
$isHttps = (strpos($appUrl, 'https://') === 0);
URL::forceRootUrl($appUrl);
URL::forceScheme($isHttps ? 'https' : 'http');
}
// Custom validation methods // Custom validation methods
Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) { Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {

8
tests/Unit/UrlTest.php
View File

@ -22,4 +22,12 @@ class UrlTest extends TestCase
putenv('APP_URL='); putenv('APP_URL=');
} }
public function test_url_helper_sets_correct_scheme_even_when_request_scheme_is_different()
{
putenv('APP_URL=https://example.com/');
$this->refreshApplication();
$this->get('http://example.com/login')->assertSee('https://example.com/dist/styles.css');
putenv('APP_URL=');
}
} }