X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a54be85185225d6f18f94f041546dd663f8f0644..refs/pull/2233/head:/app/Http/Controllers/PermissionController.php diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php index 69e2619b6..1200d44ab 100644 --- a/app/Http/Controllers/PermissionController.php +++ b/app/Http/Controllers/PermissionController.php @@ -1,27 +1,22 @@ -role = $role; + $this->permissionsRepo = $permissionsRepo; parent::__construct(); } @@ -30,20 +25,98 @@ class PermissionController extends Controller */ public function listRoles() { - $this->checkPermission('settings-update'); - $roles = $this->role->all(); - return view('settings/roles/index', ['roles' => $roles]); + $this->checkPermission('user-roles-manage'); + $roles = $this->permissionsRepo->getAllRoles(); + return view('settings.roles.index', ['roles' => $roles]); + } + + /** + * Show the form to create a new role + */ + public function createRole() + { + $this->checkPermission('user-roles-manage'); + return view('settings.roles.create'); + } + + /** + * Store a new role in the system. + */ + public function storeRole(Request $request) + { + $this->checkPermission('user-roles-manage'); + $this->validate($request, [ + 'display_name' => 'required|min:3|max:180', + 'description' => 'max:180' + ]); + + $this->permissionsRepo->saveNewRole($request->all()); + $this->showSuccessNotification(trans('settings.role_create_success')); + return redirect('/settings/roles'); } /** * Show the form for editing a user role. - * @param $id - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @throws PermissionsException */ - public function editRole($id) + public function editRole(string $id) { - $this->checkPermission('settings-update'); - $role = $this->role->findOrFail($id); - return view('settings/roles/edit', ['role' => $role]); + $this->checkPermission('user-roles-manage'); + $role = $this->permissionsRepo->getRoleById($id); + if ($role->hidden) { + throw new PermissionsException(trans('errors.role_cannot_be_edited')); + } + return view('settings.roles.edit', ['role' => $role]); + } + + /** + * Updates a user role. + * @throws ValidationException + */ + public function updateRole(Request $request, string $id) + { + $this->checkPermission('user-roles-manage'); + $this->validate($request, [ + 'display_name' => 'required|min:3|max:180', + 'description' => 'max:180' + ]); + + $this->permissionsRepo->updateRole($id, $request->all()); + $this->showSuccessNotification(trans('settings.role_update_success')); + return redirect('/settings/roles'); + } + + /** + * Show the view to delete a role. + * Offers the chance to migrate users. + */ + public function showDeleteRole(string $id) + { + $this->checkPermission('user-roles-manage'); + $role = $this->permissionsRepo->getRoleById($id); + $roles = $this->permissionsRepo->getAllRolesExcept($role); + $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]); + $roles->prepend($blankRole); + return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]); + } + + /** + * Delete a role from the system, + * Migrate from a previous role if set. + * @throws Exception + */ + public function deleteRole(Request $request, string $id) + { + $this->checkPermission('user-roles-manage'); + + try { + $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id')); + } catch (PermissionsException $e) { + $this->showErrorNotification($e->getMessage()); + return redirect()->back(); + } + + $this->showSuccessNotification(trans('settings.role_delete_success')); + return redirect('/settings/roles'); } }