X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ce53f641ada295200ad2f14683d2e74fbaa443ab..refs/pull/5280/head:/app/Users/Controllers/UserAccountController.php diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php index d9cb58f8c..708a91e9d 100644 --- a/app/Users/Controllers/UserAccountController.php +++ b/app/Users/Controllers/UserAccountController.php @@ -2,7 +2,7 @@ namespace BookStack\Users\Controllers; -use BookStack\Access\SocialAuthService; +use BookStack\Access\SocialDriverManager; use BookStack\Http\Controller; use BookStack\Permissions\PermissionApplicator; use BookStack\Settings\UserNotificationPreferences; @@ -20,7 +20,6 @@ class UserAccountController extends Controller ) { $this->middleware(function (Request $request, Closure $next) { $this->preventGuestAccess(); - $this->preventAccessInDemoMode(); return $next($request); }); } @@ -53,6 +52,8 @@ class UserAccountController extends Controller */ public function updateProfile(Request $request, ImageRepo $imageRepo) { + $this->preventAccessInDemoMode(); + $user = user(); $validated = $this->validate($request, [ 'name' => ['min:2', 'max:100'], @@ -143,6 +144,7 @@ class UserAccountController extends Controller */ public function updateNotifications(Request $request) { + $this->preventAccessInDemoMode(); $this->checkPermission('receive-notifications'); $data = $this->validate($request, [ 'preferences' => ['required', 'array'], @@ -159,7 +161,7 @@ class UserAccountController extends Controller /** * Show the view for the "Access & Security" account options. */ - public function showAuth(SocialAuthService $socialAuthService) + public function showAuth(SocialDriverManager $socialDriverManager) { $mfaMethods = user()->mfaValues()->get()->groupBy('method'); @@ -169,7 +171,7 @@ class UserAccountController extends Controller 'category' => 'auth', 'mfaMethods' => $mfaMethods, 'authMethod' => config('auth.method'), - 'activeSocialDrivers' => $socialAuthService->getActiveDrivers(), + 'activeSocialDrivers' => $socialDriverManager->getActive(), ]); } @@ -178,6 +180,8 @@ class UserAccountController extends Controller */ public function updatePassword(Request $request) { + $this->preventAccessInDemoMode(); + if (config('auth.method') !== 'standard') { $this->showPermissionError(); }