From 7ba6962707788da3d61807db3818de0ef709510f Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 17 Jan 2021 13:41:43 +0000 Subject: [PATCH] Removed lesser-used middleware and updated localization middleware So that DB/User access is not explicitly enforced. Same for GlobalViewData middleware although that was also just doubling up on ways to access user/auth info. Also cleaned up Localization Middleware doc blocks. --- app/Http/Controllers/HomeController.php | 3 +- app/Http/Kernel.php | 1 - app/Http/Middleware/GlobalViewData.php | 27 -------------- app/Http/Middleware/Localization.php | 35 +++++++++++-------- resources/views/books/index.blade.php | 2 +- resources/views/common/home-sidebar.blade.php | 4 +-- resources/views/common/home.blade.php | 6 ++-- .../views/components/expand-toggle.blade.php | 2 +- resources/views/partials/sort.blade.php | 2 +- .../views/partials/view-toggle.blade.php | 2 +- resources/views/settings/navbar.blade.php | 8 ++--- resources/views/settings/roles/form.blade.php | 4 +-- resources/views/shelves/index.blade.php | 2 +- resources/views/users/create.blade.php | 2 +- resources/views/users/edit.blade.php | 8 ++--- resources/views/users/index.blade.php | 14 +++----- 16 files changed, 48 insertions(+), 74 deletions(-) delete mode 100644 app/Http/Middleware/GlobalViewData.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d97740d27..3258f4369 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -110,15 +110,16 @@ class HomeController extends Controller /** * Show the view for /robots.txt - * @return $this */ public function getRobots() { $sitePublic = setting('app-public', false); $allowRobots = config('app.allow_robots'); + if ($allowRobots === null) { $allowRobots = $sitePublic; } + return response() ->view('common.robots', ['allowRobots' => $allowRobots]) ->header('Content-Type', 'text/plain'); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 532942f23..075c98ec7 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -29,7 +29,6 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \BookStack\Http\Middleware\VerifyCsrfToken::class, \BookStack\Http\Middleware\Localization::class, - \BookStack\Http\Middleware\GlobalViewData::class, ], 'api' => [ \BookStack\Http\Middleware\ThrottleApiRequests::class, diff --git a/app/Http/Middleware/GlobalViewData.php b/app/Http/Middleware/GlobalViewData.php deleted file mode 100644 index bc132dfc3..000000000 --- a/app/Http/Middleware/GlobalViewData.php +++ /dev/null @@ -1,27 +0,0 @@ -share('signedIn', auth()->check()); - view()->share('currentUser', user()); - - return $next($request); - } -} diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php index 6a8ec237d..597d28365 100644 --- a/app/Http/Middleware/Localization.php +++ b/app/Http/Middleware/Localization.php @@ -57,12 +57,7 @@ class Localization $defaultLang = config('app.locale'); config()->set('app.default_locale', $defaultLang); - if (user()->isDefault() && config('app.auto_detect_locale')) { - $locale = $this->autoDetectLocale($request, $defaultLang); - } else { - $locale = setting()->getUser(user(), 'language', $defaultLang); - } - + $locale = $this->getUserLocale($request, $defaultLang); config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale))); // Set text direction @@ -76,14 +71,29 @@ class Localization return $next($request); } + /** + * Get the locale specifically for the currently logged in user if available. + */ + protected function getUserLocale(Request $request, string $default): string + { + try { + $user = user(); + } catch (\Exception $exception) { + return $default; + } + + if ($user->isDefault() && config('app.auto_detect_locale')) { + return $this->autoDetectLocale($request, $default); + } + + return setting()->getUser($user, 'language', $default); + } + /** * Autodetect the visitors locale by matching locales in their headers * against the locales supported by BookStack. - * @param Request $request - * @param string $default - * @return string */ - protected function autoDetectLocale(Request $request, string $default) + protected function autoDetectLocale(Request $request, string $default): string { $availableLocales = config('app.locales'); foreach ($request->getLanguages() as $lang) { @@ -96,10 +106,8 @@ class Localization /** * Get the ISO version of a BookStack language name - * @param string $locale - * @return string */ - public function getLocaleIso(string $locale) + public function getLocaleIso(string $locale): string { return $this->localeMap[$locale] ?? $locale; } @@ -107,7 +115,6 @@ class Localization /** * Set the system date locale for localized date formatting. * Will try both the standard locale name and the UTF8 variant. - * @param string $locale */ protected function setSystemDateLocale(string $locale) { diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index f3c3ee34b..81fb66cfc 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -36,7 +36,7 @@
{{ trans('common.actions') }}
- @if($currentUser->can('book-create-all')) + @if(user()->can('book-create-all')) @icon('add') {{ trans('entities.books_create') }} diff --git a/resources/views/common/home-sidebar.blade.php b/resources/views/common/home-sidebar.blade.php index 12adda618..4c36ce61a 100644 --- a/resources/views/common/home-sidebar.blade.php +++ b/resources/views/common/home-sidebar.blade.php @@ -6,11 +6,11 @@ @endif
-
{{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}
+
{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}
@include('partials.entity-list', [ 'entities' => $recents, 'style' => 'compact', - 'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty') + 'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty') ])
diff --git a/resources/views/common/home.blade.php b/resources/views/common/home.blade.php index 2631f1a57..ad503463e 100644 --- a/resources/views/common/home.blade.php +++ b/resources/views/common/home.blade.php @@ -29,13 +29,13 @@
@endif -
-

{{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}

+
+

{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}

@include('partials.entity-list', [ 'entities' => $recents, 'style' => 'compact', - 'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty') + 'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty') ])
diff --git a/resources/views/components/expand-toggle.blade.php b/resources/views/components/expand-toggle.blade.php index a24f9ac1e..0c1449038 100644 --- a/resources/views/components/expand-toggle.blade.php +++ b/resources/views/components/expand-toggle.blade.php @@ -4,7 +4,7 @@ $key - Unique key for checking existing stored state. --}} getForCurrentUser('section_expansion#'. $key); ?>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index f78c25ceb..7fb12bd75 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -8,7 +8,7 @@
-

{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

+

{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

id}") }}" method="post" enctype="multipart/form-data"> {!! csrf_field() !!} @@ -54,7 +54,7 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }} @if($authMethod !== 'system') id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }} @endif @@ -63,7 +63,7 @@
- @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) + @if(user()->id === $user->id && count($activeSocialDrivers) > 0)

{{ trans('settings.users_social_accounts') }}

{{ trans('settings.users_social_accounts_info') }}

@@ -88,7 +88,7 @@
@endif - @if(($currentUser->id === $user->id && userCan('access-api')) || userCan('users-manage')) + @if((user()->id === $user->id && userCan('access-api')) || userCan('users-manage')) @include('users.api-tokens.list', ['user' => $user]) @endif diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 68641ca64..6bc229ec6 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -21,9 +21,7 @@ - @if(userCan('users-manage')) - {{ trans('settings.users_add_new') }} - @endif + {{ trans('settings.users_add_new') }} @@ -44,13 +42,9 @@ {{ $user->name }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - id}") }}"> - @endif - {{ $user->name }}
{{ $user->email }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - - @endif + id}") }}"> + {{ $user->name }}
{{ $user->email }} + @foreach($user->roles as $index => $role)