Add socialite authentication for okta

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9f6a4105f1656fc1d5db21c5f4883447a929c164..fe5c7a243b6c4e7899cf5730da9755225268f371 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,12 +1,8 @@
-<?php
+<?php namespace BookStack\Http\Controllers;

 
 

-namespace BookStack\Http\Controllers;
-
-use BookStack\Activity;
+use Exception;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-

 use Illuminate\Http\Response;
 use Illuminate\Http\Response;

-use BookStack\Http\Requests;

 use BookStack\Repos\UserRepo;
 use BookStack\Services\SocialAuthService;
 use BookStack\User;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\SocialAuthService;
 use BookStack\User;


@@ -31,14 +27,21 @@ class UserController extends Controller
 
     /**
      * Display a listing of the users.
 
     /**
      * Display a listing of the users.

+     * @param Request $request

      * @return Response
      */
      * @return Response
      */

-    public function index()
+    public function index(Request $request)

     {
         $this->checkPermission('users-manage');
     {
         $this->checkPermission('users-manage');

-        $users = $this->userRepo->getAllUsers();
-        $this->setPageTitle('Users');
-        return view('users/index', ['users' => $users]);
+        $listDetails = [
+            'order' => $request->get('order', 'asc'),
+            'search' => $request->get('search', ''),
+            'sort' => $request->get('sort', 'name'),
+        ];
+        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
+        $this->setPageTitle(trans('settings.users'));
+        $users->appends($listDetails);
+        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);

     }
 
     /**
     }
 
     /**


@@ -49,7 +52,8 @@ class UserController extends Controller
     {
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
     {
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');

-        return view('users/create', ['authMethod' => $authMethod]);
+        $roles = $this->userRepo->getAllRoles();
+        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**


@@ -74,7 +78,6 @@ class UserController extends Controller
         }
         $this->validate($request, $validationRules);
 
         }
         $this->validate($request, $validationRules);
 

-

         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {


@@ -85,16 +88,21 @@ class UserController extends Controller
 
         $user->save();
 
 
         $user->save();
 

-        if ($request->has('roles')) {
+        if ($request->filled('roles')) {

             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Get avatar from gravatar and save
         if (!config('services.disable_services')) {
             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Get avatar from gravatar and save
         if (!config('services.disable_services')) {

-            $avatar = \Images::saveUserGravatar($user);
-            $user->avatar()->associate($avatar);
-            $user->save();
+            try {
+                $avatar = \Images::saveUserGravatar($user);
+                $user->avatar()->associate($avatar);
+                $user->save();
+            } catch (Exception $e) {
+                \Log::error('Failed to save user gravatar image');
+            }
+

         }
 
         return redirect('/settings/users');
         }
 
         return redirect('/settings/users');


@@ -112,12 +120,14 @@ class UserController extends Controller
             return $this->currentUser->id == $id;
         });
 
             return $this->currentUser->id == $id;
         });
 

-        $authMethod = config('auth.method');
-

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

+
+        $authMethod = ($user->system_name) ? 'system' : config('auth.method');
+

         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();

-        $this->setPageTitle('User Profile');
-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]);
+        $this->setPageTitle(trans('settings.user_profile'));
+        $roles = $this->userRepo->getAllRoles();
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**


@@ -137,39 +147,47 @@ class UserController extends Controller
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,
             'password'         => 'min:5|required_with:password_confirm',
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,
             'password'         => 'min:5|required_with:password_confirm',

-            'password-confirm' => 'same:password|required_with:password'
-        ], [
-            'password-confirm.required_with' => 'Password confirmation required'
+            'password-confirm' => 'same:password|required_with:password',
+            'setting'          => 'array'

         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 
         // Role updates
         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 
         // Role updates

-        if (userCan('users-manage') && $request->has('roles')) {
+        if (userCan('users-manage') && $request->filled('roles')) {

             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Password updates
             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Password updates

-        if ($request->has('password') && $request->get('password') != '') {
+        if ($request->filled('password')) {

             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
 
         // External auth id updates
             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
 
         // External auth id updates

-        if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) {
+        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
             $user->external_auth_id = $request->get('external_auth_id');
         }
 

+        // Save an user-specific settings
+        if ($request->filled('setting')) {
+            foreach ($request->get('setting') as $key => $value) {
+                setting()->putUser($user, $key, $value);
+            }
+        }
+

         $user->save();
         $user->save();

-        session()->flash('success', 'User successfully updated');
-        return redirect('/settings/users');
+        session()->flash('success', trans('settings.users_edit_success'));
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);

     }
 
     /**
      * Show the user delete page.
     }
 
     /**
      * Show the user delete page.

-     * @param $id
+     * @param int $id

      * @return \Illuminate\View\View
      */
     public function delete($id)
      * @return \Illuminate\View\View
      */
     public function delete($id)


@@ -179,7 +197,7 @@ class UserController extends Controller
         });
 
         $user = $this->user->findOrFail($id);
         });
 
         $user = $this->user->findOrFail($id);

-        $this->setPageTitle('Delete User ' . $user->name);
+        $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));

         return view('users/delete', ['user' => $user]);
     }
 
         return view('users/delete', ['user' => $user]);
     }
 


@@ -196,11 +214,19 @@ class UserController extends Controller
         });
 
         $user = $this->userRepo->getById($id);
         });
 
         $user = $this->userRepo->getById($id);

+

         if ($this->userRepo->isOnlyAdmin($user)) {
         if ($this->userRepo->isOnlyAdmin($user)) {

-            session()->flash('error', 'You cannot delete the only admin');
+            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));

             return redirect($user->getEditUrl());
         }
             return redirect($user->getEditUrl());
         }

+
+        if ($user->system_name === 'public') {
+            session()->flash('error', trans('errors.users_cannot_delete_guest'));
+            return redirect($user->getEditUrl());
+        }
+

         $this->userRepo->destroy($user);
         $this->userRepo->destroy($user);

+        session()->flash('success', trans('settings.users_delete_success'));

 
         return redirect('/settings/users');
     }
 
         return redirect('/settings/users');
     }