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 b5184c40acace93088c439b0b2eb3383ef4e8a56..fe5c7a243b6c4e7899cf5730da9755225268f371 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,13 +1,8 @@
-<?php
+<?php namespace BookStack\Http\Controllers;

 
 

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

 use Exception;
 use Illuminate\Http\Request;
 use Exception;
 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;


@@ -39,9 +34,9 @@ class UserController extends Controller
     {
         $this->checkPermission('users-manage');
         $listDetails = [
     {
         $this->checkPermission('users-manage');
         $listDetails = [

-            'order' => $request->has('order') ? $request->get('order') : 'asc',
-            'search' => $request->has('search') ? $request->get('search') : '',
-            'sort' => $request->has('sort') ? $request->get('sort') : 'name',
+            '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 = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
         $this->setPageTitle(trans('settings.users'));


@@ -93,7 +88,7 @@ class UserController extends Controller
 
         $user->save();
 
 
         $user->save();
 

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

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


@@ -152,29 +147,37 @@ 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' => '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();
         session()->flash('success', trans('settings.users_edit_success'));
 
         $user->save();
         session()->flash('success', trans('settings.users_edit_success'));