Fix build:js:watch not building at first launch in Docker

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

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index 69e2619b69aa6186b364f9630af4af35e0bb66b0..1200d44ab69092ddcd3e498a2abf9ac961386f7a 100644 (file)
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -1,27 +1,22 @@
-<?php
+<?php namespace BookStack\Http\Controllers;

 
 

-namespace BookStack\Http\Controllers;
-
-use BookStack\Role;
-use BookStack\User;
+use BookStack\Auth\Permissions\PermissionsRepo;
+use BookStack\Exceptions\PermissionsException;
+use Exception;

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

-
-use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
+use Illuminate\Validation\ValidationException;

 
 class PermissionController extends Controller
 {
 
 
 class PermissionController extends Controller
 {
 

-    protected $role;
+    protected $permissionsRepo;

 
     /**
      * PermissionController constructor.
 
     /**
      * PermissionController constructor.

-     * @param $role
-     * @param $user

      */
      */

-    public function __construct(Role $role)
+    public function __construct(PermissionsRepo $permissionsRepo)

     {
     {

-        $this->role = $role;
+        $this->permissionsRepo = $permissionsRepo;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -30,20 +25,98 @@ class PermissionController extends Controller
      */
     public function listRoles()
     {
      */
     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.
     }
 
     /**
      * 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');

     }
 }
     }
 }