colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into release

This commit is contained in:
Dan Brown 2019-09-01 12:12:10 +01:00
parent c44a8df55d 7a4425473b
commit 58a5008718
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()
{
// 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
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=');
}
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=');
}
}