From e640247a0e4e1c229f88a767e32922a0ec2df5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 20 Jan 2016 23:31:55 +0100 Subject: [PATCH 1/6] FEATURE #1359: add views and controller for user management This commit contains only placeholder files, not really working code. --- app/Http/Controllers/Admin/UserManagement.php | 13 +++++++++++++ .../views/admin/userManagement/addOrEdit.blade.php | 0 .../views/admin/userManagement/detail.blade.php | 0 resources/views/admin/userManagement/list.blade.php | 0 4 files changed, 13 insertions(+) create mode 100644 app/Http/Controllers/Admin/UserManagement.php create mode 100644 resources/views/admin/userManagement/addOrEdit.blade.php create mode 100644 resources/views/admin/userManagement/detail.blade.php create mode 100644 resources/views/admin/userManagement/list.blade.php diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php new file mode 100644 index 00000000..a59b6890 --- /dev/null +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -0,0 +1,13 @@ + Date: Thu, 21 Jan 2016 01:08:03 +0100 Subject: [PATCH 2/6] FEATURE #1359: registration works now Some basic form of registration is done. It does not look very nice, however I was able to create new user. This part will need a lots of other improvements, however new user was created. Yay! --- app/Http/Controllers/Admin/UserManagement.php | 68 ++++++++++++++- app/Http/Controllers/Controller.php | 17 ++++ app/Http/routes.php | 32 ++++++++ app/Models/User.php | 36 ++++++-- database/schema.sql | 82 +++++++++---------- resources/lang/en/admin/userManagement.php | 13 +++ .../admin/userManagement/addOrEdit.blade.php | 0 .../views/admin/userManagement/edit.blade.php | 1 + .../views/admin/userManagement/new.blade.php | 61 ++++++++++++++ 9 files changed, 257 insertions(+), 53 deletions(-) create mode 100644 resources/lang/en/admin/userManagement.php delete mode 100644 resources/views/admin/userManagement/addOrEdit.blade.php create mode 100644 resources/views/admin/userManagement/edit.blade.php create mode 100644 resources/views/admin/userManagement/new.blade.php diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index a59b6890..114e75e5 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -2,12 +2,72 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\Request; - -use App\Http\Requests; use App\Http\Controllers\Controller; +use App\Http\Requests; +use App\Models\User; +use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Hash; class UserManagement extends Controller { - // + public function getNewUser() + { + // define list of roles, this list will be used in template for selecting proper role for user + $roles = [ + User::ROLE_ADMIN => 'admin/userManagement.role_' . User::ROLE_ADMIN, + User::ROLE_EDITOR => 'admin/userManagement.role_' . User::ROLE_EDITOR, + User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR + ]; + + // render view + return $this->view('admin.userManagement.new', ['roles' => $roles]); + } + + public function getEditExistingUser($id) + { + // try to find user + $user = User::findOrFail($id); + + // render view + return $this->view('admin.userManagement.edit', ['user' => $user]); + } + + public function getOverview($state = null) + { + echo $state; + } + + /** + * Create new user + * + * This method saves new user into database + * + * @param Request $request + */ + protected function postRegistration(Request $request) + { + + // validate input data + $this->validate($request, [ + 'role' => 'required', + 'email' => 'required|email|max:128|unique:users', + 'password' => 'required|min:6' + ]); + + // when user did not provide any username, use his email + $username = isset($request->username) && !empty($request->username) ? $request->username : $request->email; + + // create new user + $user = new User(); + $user->email = $request->email; + $user->username = $username; + $user->role = $request->role; + $user->password = Hash::make($request->role); + + // store user into database + $user->save(); + + // @todo add some redirect, inform user etc. + } } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a23..83df967a 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -10,4 +10,21 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests; class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + + /** + * Custom wrapper for generating view. + * + * This method will be used for switching among templates. + * + * @todo add template support + * + * @param null $view + * @param array $data + * @param array $mergeData + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + protected function view($view = null, $data = [], $mergeData = []) { + return view($view, $data, $mergeData); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 128eb769..cce17faf 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -23,11 +23,43 @@ */ Route::group(['middleware' => ['web']], function () { + + // display login form Route::get('login', function () { return view('admin.loginForm.form'); }); + // --------------------------------------------------------------- + // @todo move to admin group (protect it) + + // display form for creating new user + Route::get('admin/users/new', 'Admin\UserManagement@getNewUser') + ->name('users.new'); + + // display form for edit of existing user + Route::get('admin/users/edit/{id}', 'Admin\UserManagement@getEditExistingUser') + ->name('users.edit'); + + // display user detail in admin + Route::get('admin/users/{id}', 'Admin\UserManagement@getDetail') + ->name('users.detail'); + + // display list of all users registered into our system + Route::get('admin/users/overview/{state?}', 'Admin\UsersManagement@getOverview') + ->name('users.overview'); + // POST methods + // ------------------------------------------ + + // create new user + Route::post('admin/users/new', 'Admin\UserManagement@postRegistration') + ->name('admin.users.registration'); + + // edit existing user + Route::post('admin/users/new', 'Admin\UserManagement@postRegistration') + ->name('admin.users.edit'); + + // handle login Route::post('admin/login', 'Admin\Login@postLogin') ->name('login'); }); diff --git a/app/Models/User.php b/app/Models/User.php index 33045e15..10a04504 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,34 +2,56 @@ namespace App\Models; +use App\Http\Requests\Request; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Validator; +use Illuminate\Validation\ValidationException; +use Symfony\Component\Process\Exception\InvalidArgumentException; /** * Class User */ class User extends Model { - public $timestamps = false; - protected $fillable = [ 'email', 'username', 'password', - 'remember_token', + 'role', 'name', 'status' ]; - protected $guarded = []; - /** * The attributes excluded from the model's JSON form. * * @var array */ protected $hidden = [ - 'password', 'remember_token', + 'password', + 'remember_token', ]; - + const STATE_DELETED = 'deleted'; + const STATE_BLOCKED = 'blocked'; + const STATE_ACTIVE = 'active'; + const ROLE_VISITOR = 'visitor'; + const ROLE_EDITOR = 'editor'; + const ROLE_ADMIN = 'admin'; + + /** + * Validation method for input data + * + * @param array $data + * + * @return + */ + public static function validate(array $data) + { + $valid = true; + + if (!$valid) { + throw new ValidationException(Validator::class, 'Invalid request'); + } + } } \ No newline at end of file diff --git a/database/schema.sql b/database/schema.sql index 99bbcc33..7067fead 100644 --- a/database/schema.sql +++ b/database/schema.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- St 20. leden 2016, 19:50:50 CET +-- Čt 21. leden 2016, 00:19:53 CET -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -12,19 +12,17 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; -- ----------------------------------------------------- -- ----------------------------------------------------- --- Schema minicms +-- Table `users` -- ----------------------------------------------------- --- ----------------------------------------------------- --- Table `user` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `user` ( +CREATE TABLE IF NOT EXISTS `users` ( `id` INT NOT NULL AUTO_INCREMENT, `email` VARCHAR(64) NOT NULL COMMENT 'E-mail is used as a contact and also as a username', `username` VARCHAR(64) NOT NULL COMMENT 'Username can be used also for login. Default value is users email.', `password` VARCHAR(128) NOT NULL COMMENT 'Password hash', + `role` ENUM('visitor', 'editor', 'admin') NOT NULL DEFAULT 'visitor' COMMENT 'User\'s role determines his permissions in the system.', `remember_token` VARCHAR(128) NULL DEFAULT NULL COMMENT 'Token used for \"remember me\" feature', `name` VARCHAR(128) NULL DEFAULT NULL, - `status` ENUM('deleted', 'blocked', 'active') NOT NULL DEFAULT 'active' , + `status` ENUM('deleted', 'blocked', 'active') NOT NULL DEFAULT 'active', PRIMARY KEY (`id`), UNIQUE INDEX `email_UNIQUE` (`email` ASC)) ENGINE = InnoDB @@ -32,9 +30,9 @@ COMMENT = 'Table with users who are allowed to log into system'; -- ----------------------------------------------------- --- Table `module` +-- Table `modules` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `module` ( +CREATE TABLE IF NOT EXISTS `modules` ( `handler` VARCHAR(64) NOT NULL, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `name` VARCHAR(64) NOT NULL, @@ -44,9 +42,9 @@ ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `file` +-- Table `files` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `file` ( +CREATE TABLE IF NOT EXISTS `files` ( `id` INT NOT NULL, `user_id` INT NOT NULL, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -57,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `file` ( INDEX `fk_file_user1_idx` (`user_id` ASC), CONSTRAINT `fk_file_user1` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB @@ -65,9 +63,9 @@ COMMENT = 'Table containing files which were uploaded into system.'; -- ----------------------------------------------------- --- Table `content` +-- Table `contents` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `content` ( +CREATE TABLE IF NOT EXISTS `contents` ( `id` INT NOT NULL, `user_id` INT NOT NULL, `module_handler` VARCHAR(64) NOT NULL, @@ -92,17 +90,17 @@ CREATE TABLE IF NOT EXISTS `content` ( INDEX `fk_content_file1_idx` (`title_photo` ASC), CONSTRAINT `fk_content_user1` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_content_module1` FOREIGN KEY (`module_handler`) - REFERENCES `module` (`handler`) + REFERENCES `modules` (`handler`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_content_file1` FOREIGN KEY (`title_photo`) - REFERENCES `file` (`id`) + REFERENCES `files` (`id`) ON DELETE SET NULL ON UPDATE CASCADE) ENGINE = InnoDB @@ -128,12 +126,12 @@ CREATE TABLE IF NOT EXISTS `content_history` ( INDEX `fk_content_history_content1_idx` (`content_id` ASC), CONSTRAINT `fk_content_history_users` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_content_history_content1` FOREIGN KEY (`content_id`) - REFERENCES `content` (`id`) + REFERENCES `contents` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB @@ -141,9 +139,9 @@ COMMENT = 'Table for holding history of changes on some content.'; -- ----------------------------------------------------- --- Table `widget_type` +-- Table `widget_types` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `widget_type` ( +CREATE TABLE IF NOT EXISTS `widget_types` ( `handler` VARCHAR(64) NOT NULL COMMENT 'Class wich handles everything about this widget type', `name` VARCHAR(64) NOT NULL COMMENT 'Name is used only in admin for better readability.', `description` TEXT NULL DEFAULT NULL COMMENT 'This field also improves readability.', @@ -153,9 +151,9 @@ COMMENT = 'Widget type table contains information about all installed widgets. T -- ----------------------------------------------------- --- Table `widget` +-- Table `widgets` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `widget` ( +CREATE TABLE IF NOT EXISTS `widgets` ( `id` INT NOT NULL, `widget_type_handler` VARCHAR(64) NOT NULL, `user_id` INT NOT NULL COMMENT 'User ID who created this widget', @@ -168,12 +166,12 @@ CREATE TABLE IF NOT EXISTS `widget` ( INDEX `fk_widget_widget_type1_idx` (`widget_type_handler` ASC), CONSTRAINT `fk_widget_user1` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_widget_widget_type1` FOREIGN KEY (`widget_type_handler`) - REFERENCES `widget_type` (`handler`) + REFERENCES `widget_types` (`handler`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB @@ -181,9 +179,9 @@ COMMENT = 'Widget is a small piece of content, which can be inserted into widget -- ----------------------------------------------------- --- Table `widget_area` +-- Table `widget_areas` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `widget_area` ( +CREATE TABLE IF NOT EXISTS `widget_areas` ( `id` INT NOT NULL, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -209,21 +207,21 @@ CREATE TABLE IF NOT EXISTS `widget_in_widget_area` ( INDEX `position` (`position` ASC), CONSTRAINT `fk_widget_has_widget_area_widget1` FOREIGN KEY (`widget_id`) - REFERENCES `widget` (`id`) + REFERENCES `widgets` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_widget_has_widget_area_widget_area1` FOREIGN KEY (`widget_area_id`) - REFERENCES `widget_area` (`id`) + REFERENCES `widget_areas` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `custom_field` +-- Table `custom_fields` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `custom_field` ( +CREATE TABLE IF NOT EXISTS `custom_fields` ( `id` INT NOT NULL, `handler` VARCHAR(64) NOT NULL COMMENT 'Class name, which handles saving and retrieving given custom field.', `name` VARCHAR(128) NULL, @@ -250,21 +248,21 @@ CREATE TABLE IF NOT EXISTS `user_has_custom_field` ( INDEX `fk_user_has_custom_field_user1_idx` (`user_id` ASC), CONSTRAINT `fk_user_has_custom_field_user1` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_user_has_custom_field_custom_field1` FOREIGN KEY (`custom_field_id`) - REFERENCES `custom_field` (`id`) + REFERENCES `custom_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `custom_field_type` +-- Table `custom_field_types` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `custom_field_type` ( +CREATE TABLE IF NOT EXISTS `custom_field_types` ( `id` INT NOT NULL, `name` VARCHAR(45) NOT NULL, `custom_field_id` INT NOT NULL, @@ -273,7 +271,7 @@ CREATE TABLE IF NOT EXISTS `custom_field_type` ( INDEX `fk_custom_field_type_custom_field1_idx` (`custom_field_id` ASC), CONSTRAINT `fk_custom_field_type_custom_field1` FOREIGN KEY (`custom_field_id`) - REFERENCES `custom_field` (`id`) + REFERENCES `custom_fields` (`id`) ON DELETE RESTRICT ON UPDATE NO ACTION) ENGINE = InnoDB @@ -292,21 +290,21 @@ CREATE TABLE IF NOT EXISTS `module_has_custom_field` ( INDEX `fk_module_has_custom_field_module1_idx` (`module_handler` ASC), CONSTRAINT `fk_module_has_custom_field_module1` FOREIGN KEY (`module_handler`) - REFERENCES `module` (`handler`) + REFERENCES `modules` (`handler`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_module_has_custom_field_custom_field1` FOREIGN KEY (`custom_field_id`) - REFERENCES `custom_field` (`id`) + REFERENCES `custom_fields` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `action_log_type` +-- Table `action_log_types` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `action_log_type` ( +CREATE TABLE IF NOT EXISTS `action_log_types` ( `id` INT NOT NULL, `name` VARCHAR(45) NULL, PRIMARY KEY (`id`)) @@ -328,12 +326,12 @@ CREATE TABLE IF NOT EXISTS `action_log` ( INDEX `fk_action_log_user1_idx` (`user_id` ASC), CONSTRAINT `fk_action_log_action_log_type1` FOREIGN KEY (`type_id`) - REFERENCES `action_log_type` (`id`) + REFERENCES `action_log_types` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_action_log_user1` FOREIGN KEY (`user_id`) - REFERENCES `user` (`id`) + REFERENCES `users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php new file mode 100644 index 00000000..093c6910 --- /dev/null +++ b/resources/lang/en/admin/userManagement.php @@ -0,0 +1,13 @@ + 'Full name', + 'email' => 'Email', + 'password' => 'Password', + 'roles' => 'Please, select user\'s role', + 'role_admin' => 'Admin', + 'role_editor' => 'Editor', + 'role_visitor' => 'Visitor', + 'register' => 'Create user' + +]; \ No newline at end of file diff --git a/resources/views/admin/userManagement/addOrEdit.blade.php b/resources/views/admin/userManagement/addOrEdit.blade.php deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php new file mode 100644 index 00000000..9fbfee07 --- /dev/null +++ b/resources/views/admin/userManagement/edit.blade.php @@ -0,0 +1 @@ +edituji uzivatele {{$id}}. \ No newline at end of file diff --git a/resources/views/admin/userManagement/new.blade.php b/resources/views/admin/userManagement/new.blade.php new file mode 100644 index 00000000..8a60b348 --- /dev/null +++ b/resources/views/admin/userManagement/new.blade.php @@ -0,0 +1,61 @@ +@extends('admin.layout') + +@section('content') +
+ {!! csrf_field() !!} + + + + + + + +
+ @lang('admin/userManagement.roles') + + @foreach($roles as $role => $translation) + + @endforeach + + + @if ($errors->has('role')) + + {{ $errors->first('role') }} + + @endif +
+ + +
+ + + +@stop \ No newline at end of file From 495d578188761a147c56acced1775e47a52614b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 21 Jan 2016 01:46:41 +0100 Subject: [PATCH 3/6] FEATURE #1359: add full name for saving into database --- app/Http/Controllers/Admin/UserManagement.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index 114e75e5..aebf46ac 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -60,6 +60,7 @@ class UserManagement extends Controller // create new user $user = new User(); + $user->name = $request->name; $user->email = $request->email; $user->username = $username; $user->role = $request->role; From f133aee36a93251972bae182f33a45add56d7056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 21 Jan 2016 02:06:42 +0100 Subject: [PATCH 4/6] REFACTORING: moved canonical controllers to separate directory --- app/Http/Controllers/{Admin => OriginalAdmin}/AuthController.php | 0 .../Controllers/{Admin => OriginalAdmin}/PasswordController.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename app/Http/Controllers/{Admin => OriginalAdmin}/AuthController.php (100%) rename app/Http/Controllers/{Admin => OriginalAdmin}/PasswordController.php (100%) diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/OriginalAdmin/AuthController.php similarity index 100% rename from app/Http/Controllers/Admin/AuthController.php rename to app/Http/Controllers/OriginalAdmin/AuthController.php diff --git a/app/Http/Controllers/Admin/PasswordController.php b/app/Http/Controllers/OriginalAdmin/PasswordController.php similarity index 100% rename from app/Http/Controllers/Admin/PasswordController.php rename to app/Http/Controllers/OriginalAdmin/PasswordController.php From eb64ca71b7d247c2fb5292e269ba511e9b51baec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 21 Jan 2016 02:10:40 +0100 Subject: [PATCH 5/6] FEATURE #1359: change hashing function --- app/Http/Controllers/Admin/UserManagement.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index aebf46ac..711605cf 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests; use App\Models\User; use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Hashing\BcryptHasher; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; @@ -64,7 +65,7 @@ class UserManagement extends Controller $user->email = $request->email; $user->username = $username; $user->role = $request->role; - $user->password = Hash::make($request->role); + $user->password = bcrypt($request->role); // store user into database $user->save(); From 75a4ac7fe0cbb6a820c78ff5dfa67fcf1a052ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 21 Jan 2016 02:40:34 +0100 Subject: [PATCH 6/6] FIX: fix wrong parameter in password --- app/Http/Controllers/Admin/UserManagement.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index 711605cf..07cb8d8e 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -5,8 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests; use App\Models\User; -use Illuminate\Foundation\Validation\ValidatesRequests; -use Illuminate\Hashing\BcryptHasher; +use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; @@ -65,11 +64,10 @@ class UserManagement extends Controller $user->email = $request->email; $user->username = $username; $user->role = $request->role; - $user->password = bcrypt($request->role); + $user->password = Hash::make($request->password); // store user into database $user->save(); - // @todo add some redirect, inform user etc. } }