ZIP Imports: Added API examples, finished testing

[bookstack] / app / Users / Controllers / UserAccountController.php

diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 2ff58ffac3a75815d9ab36864c9c6e8dc676e662..708a91e9d4a4a6335d919bdf19d1d305f55f5a78 100644 (file)
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Users\Controllers;
 
 
 namespace BookStack\Users\Controllers;
 

-use BookStack\Access\SocialAuthService;
+use BookStack\Access\SocialDriverManager;

 use BookStack\Http\Controller;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\UserNotificationPreferences;
 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->middleware(function (Request $request, Closure $next) {
             $this->preventGuestAccess();

-            $this->preventAccessInDemoMode();

             return $next($request);
         });
     }
             return $next($request);
         });
     }


@@ -40,6 +39,8 @@ class UserAccountController extends Controller
      */
     public function showProfile()
     {
      */
     public function showProfile()
     {

+        $this->setPageTitle(trans('preferences.profile'));
+

         return view('users.account.profile', [
             'model' => user(),
             'category' => 'profile',
         return view('users.account.profile', [
             'model' => user(),
             'category' => 'profile',


@@ -51,6 +52,8 @@ class UserAccountController extends Controller
      */
     public function updateProfile(Request $request, ImageRepo $imageRepo)
     {
      */
     public function updateProfile(Request $request, ImageRepo $imageRepo)
     {

+        $this->preventAccessInDemoMode();
+

         $user = user();
         $validated = $this->validate($request, [
             'name'             => ['min:2', 'max:100'],
         $user = user();
         $validated = $this->validate($request, [
             'name'             => ['min:2', 'max:100'],


@@ -141,6 +144,7 @@ class UserAccountController extends Controller
      */
     public function updateNotifications(Request $request)
     {
      */
     public function updateNotifications(Request $request)
     {

+        $this->preventAccessInDemoMode();

         $this->checkPermission('receive-notifications');
         $data = $this->validate($request, [
            'preferences' => ['required', 'array'],
         $this->checkPermission('receive-notifications');
         $data = $this->validate($request, [
            'preferences' => ['required', 'array'],


@@ -157,9 +161,9 @@ class UserAccountController extends Controller
     /**
      * Show the view for the "Access & Security" account options.
      */
     /**
      * Show the view for the "Access & Security" account options.
      */

-    public function showAuth(SocialAuthService $socialAuthService)
+    public function showAuth(SocialDriverManager $socialDriverManager)

     {
     {

-        $mfaMethods = user()->mfaValues->groupBy('method');
+        $mfaMethods = user()->mfaValues()->get()->groupBy('method');

 
         $this->setPageTitle(trans('preferences.auth'));
 
 
         $this->setPageTitle(trans('preferences.auth'));
 


@@ -167,7 +171,7 @@ class UserAccountController extends Controller
             'category' => 'auth',
             'mfaMethods' => $mfaMethods,
             'authMethod' => config('auth.method'),
             'category' => 'auth',
             'mfaMethods' => $mfaMethods,
             'authMethod' => config('auth.method'),

-            'activeSocialDrivers' => $socialAuthService->getActiveDrivers(),
+            'activeSocialDrivers' => $socialDriverManager->getActive(),

         ]);
     }
 
         ]);
     }
 


@@ -176,6 +180,8 @@ class UserAccountController extends Controller
      */
     public function updatePassword(Request $request)
     {
      */
     public function updatePassword(Request $request)
     {

+        $this->preventAccessInDemoMode();
+

         if (config('auth.method') !== 'standard') {
             $this->showPermissionError();
         }
         if (config('auth.method') !== 'standard') {
             $this->showPermissionError();
         }