Removed old str_random functions from seeders

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c7a7c5646cb5097dafbc04c46cf1ea390a91db82..156256cb94fd4d28ae0aeabbd864baa63f3e4ded 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,30 +1,35 @@
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\Access\SocialAuthService;
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\Access\SocialAuthService;

+use BookStack\Auth\Access\UserInviteService;

 use BookStack\Auth\User;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use BookStack\Auth\User;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

+use Illuminate\Support\Str;

 
 class UserController extends Controller
 {
 
     protected $user;
     protected $userRepo;
 
 class UserController extends Controller
 {
 
     protected $user;
     protected $userRepo;

+    protected $inviteService;

     protected $imageRepo;
 
     /**
      * UserController constructor.
      * @param User $user
      * @param UserRepo $userRepo
     protected $imageRepo;
 
     /**
      * UserController constructor.
      * @param User $user
      * @param UserRepo $userRepo

+     * @param UserInviteService $inviteService

      * @param ImageRepo $imageRepo
      */
      * @param ImageRepo $imageRepo
      */

-    public function __construct(User $user, UserRepo $userRepo, ImageRepo $imageRepo)
+    public function __construct(User $user, UserRepo $userRepo, UserInviteService $inviteService, ImageRepo $imageRepo)

     {
         $this->user = $user;
         $this->userRepo = $userRepo;
     {
         $this->user = $user;
         $this->userRepo = $userRepo;

+        $this->inviteService = $inviteService;

         $this->imageRepo = $imageRepo;
         parent::__construct();
     }
         $this->imageRepo = $imageRepo;
         parent::__construct();
     }


@@ -75,8 +80,10 @@ class UserController extends Controller
         ];
 
         $authMethod = config('auth.method');
         ];
 
         $authMethod = config('auth.method');

-        if ($authMethod === 'standard') {
-            $validationRules['password'] = 'required|min:5';
+        $sendInvite = ($request->get('send_invite', 'false') === 'true');
+
+        if ($authMethod === 'standard' && !$sendInvite) {
+            $validationRules['password'] = 'required|min:6';

             $validationRules['password-confirm'] = 'required|same:password';
         } elseif ($authMethod === 'ldap') {
             $validationRules['external_auth_id'] = 'required';
             $validationRules['password-confirm'] = 'required|same:password';
         } elseif ($authMethod === 'ldap') {
             $validationRules['external_auth_id'] = 'required';


@@ -86,19 +93,22 @@ class UserController extends Controller
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {

-            $user->password = bcrypt($request->get('password'));
+            $user->password = bcrypt($request->get('password', Str::random(32)));

         } elseif ($authMethod === 'ldap') {
             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         $user->save();
 
         } elseif ($authMethod === 'ldap') {
             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         $user->save();
 

+        if ($sendInvite) {
+            $this->inviteService->sendInvitation($user);
+        }
+

         if ($request->filled('roles')) {
             $roles = $request->get('roles');
             $this->userRepo->setUserRoles($user, $roles);
         }
 
         if ($request->filled('roles')) {
             $roles = $request->get('roles');
             $this->userRepo->setUserRoles($user, $roles);
         }
 

-        // TODO - Check this uses new profile assignment

         $this->userRepo->downloadAndAssignUserAvatar($user);
 
         return redirect('/settings/users');
         $this->userRepo->downloadAndAssignUserAvatar($user);
 
         return redirect('/settings/users');


@@ -140,14 +150,19 @@ class UserController extends Controller
         $this->validate($request, [
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,
         $this->validate($request, [
             'name'             => 'min:2',
             'email'            => 'min:2|email|unique:users,email,' . $id,

-            'password'         => 'min:5|required_with:password_confirm',
+            'password'         => 'min:6|required_with:password_confirm',

             'password-confirm' => 'same:password|required_with:password',
             'setting'          => 'array',
             'profile_image'    => $this->imageRepo->getImageValidationRules(),
         ]);
 
         $user = $this->userRepo->getById($id);
             'password-confirm' => 'same:password|required_with:password',
             'setting'          => 'array',
             'profile_image'    => $this->imageRepo->getImageValidationRules(),
         ]);
 
         $user = $this->userRepo->getById($id);

-        $user->fill($request->all());
+        $user->fill($request->except(['email']));
+
+        // Email updates
+        if (userCan('users-manage') && $request->filled('email')) {
+            $user->email = $request->get('email');
+        }

 
         // Role updates
         if (userCan('users-manage') && $request->filled('roles')) {
 
         // Role updates
         if (userCan('users-manage') && $request->filled('roles')) {


@@ -369,5 +384,4 @@ class UserController extends Controller
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }

-

 }
 }