Merge branch 'develop'

Author: nasrulhazim

app/Http/Controllers/Api/Manage/AclController.php

@@ -7,7 +7,12 @@
 
 class AclController extends Controller
 {
-    public function __invoke(Request $request)
+    public function index()
+    {
+        return response()->api(roles());
+    }
+    
+    public function update(Request $request)
     {
     	switch ($request->type) {
     		case 'create':

app/Support/helpers.php

@@ -128,19 +128,23 @@ function user()
  * roles() helper
  */
 if (! function_exists('roles')) {
-    function roles()
+    function roles($guard = 'web')
     {
-        return config('permission.models.role')::get();
+        return Cache::remember('roles.' . $guard, 10, function () use ($guard) {
+            return config('permission.models.role')::with('permissions')->where('guard_name', $guard)->get();
+        });
     }
 }
 
 /*
  * permissions() helper
  */
 if (! function_exists('permissions')) {
-    function permissions()
+    function permissions($guard)
     {
-        return config('permission.models.permission')::get();
+        return Cache::remember('permissions.' . $guard, 10, function () use ($guard) {
+            return config('permission.models.permission')::with('roles')->where('guard_name', $guard)->get();
+        });
     }
 }
 

database/seeds/RolesAndPermissionsSeeder.php

@@ -18,17 +18,13 @@ public function run()
         $guards      = collect(config('auth.guards'));
 
         $roles->each(function ($role) use ($guards) {
-            $guards->each(function ($guard, $guard_name) use ($role) {
-                config('permission.models.role')::updateOrCreate(['name' => $role, 'guard_name' => $guard_name]);
-            });
+            config('permission.models.role')::updateOrCreate(['name' => $role]);
         });
 
         $permissions->each(function ($roles, $permission) use ($actions, $guards) {
             $actions->each(function ($action) use ($roles, $permission, $guards) {
-                $name = $permission . '_' . $action;
-                $guards->each(function ($guard, $guard_name) use ($name, $roles) {
-                    config('permission.models.permission')::updateOrCreate(['name' => $name, 'guard_name' => $guard_name])->syncRoles($roles);
-                });
+                $name = kebab_case($permission . '-' . $action);
+                config('permission.models.permission')::updateOrCreate(['name' => $name])->syncRoles($roles);
             });
         });
     }