Complete support for new spatie permissions teams

Author: andrewdrake

src/Console/LaravelCrmPermissions.php

@@ -56,6 +56,7 @@ public function handle()
 
         foreach (DB::table('teams')->get() as $team) {
             foreach (DB::table('roles')
+                         ->where('crm_role', 1)
                          ->whereNull('team_id')
                          ->get() as $role) {
                 $this->info('Inserting role '.$role->name.' for team '.$team->name);
@@ -82,31 +83,12 @@ public function handle()
                                  ->leftJoin('role_has_permissions', 'permissions.id', '=', 'role_has_permissions.permission_id')
                                  ->where('role_has_permissions.role_id', $role->id)
                                  ->get() as $permission) {
-                        $this->info('Inserting permission '.$permission->name.' for role '.$role->name);
-                        
-                        DB::table('permissions')->updateOrInsert([
-                            'name' => $permission->name,
-                            'guard_name' => $permission->guard_name,
-                            'description' => $permission->description,
-                            'crm_permission' => $permission->crm_permission,
-                            'team_id' => $team->id,
-                        ], [
-                            'created_at' => Carbon::now(),
-                            'updated_at' => Carbon::now(),
-                        ]);
+                        $this->info('Assigning permission '.$permission->name.' for role '.$role->name);
 
-                        if ($newPermission = DB::table('permissions')->where([
-                            'name' => $permission->name,
-                            'guard_name' => $permission->guard_name,
-                            'description' => $permission->description,
-                            'crm_permission' => $permission->crm_permission,
-                            'team_id' => $team->id,
-                        ])->first()) {
-                            DB::table('role_has_permissions')->updateOrInsert([
-                                'permission_id' => $newPermission->id,
-                                'role_id' => $newRole->id,
-                            ]);
-                        }
+                        DB::table('role_has_permissions')->updateOrInsert([
+                            'permission_id' => $permission->id,
+                            'role_id' => $newRole->id,
+                        ]);
                     }
                 }
             }

src/Http/Middleware/HasCrmAccess.php

@@ -3,6 +3,7 @@
 namespace VentureDrake\LaravelCrm\Http\Middleware;
 
 use Closure;
+use VentureDrake\LaravelCrm\Models\Role;
 
 class HasCrmAccess
 {
@@ -30,8 +31,15 @@ public function handle($request, Closure $next)
                 'crm_access' => 1,
             ])->save();
         } elseif (config('laravel-crm.teams') && auth()->user()->currentTeam->user_id == auth()->user()->id && ! auth()->user()->hasRole('Owner')) {
-            auth()->user()->assignRole('Owner');
-
+            
+            if($role = Role::where([
+                'name' => 'Owner',
+                'team_id' => auth()->user()->currentTeam->id,
+                'crm_role' => 1
+            ])->first()){
+                auth()->user()->assignRole($role->name);
+            }
+            
             auth()->user()->forceFill([
                 'crm_access' => 1,
             ])->save();

src/LaravelCrmServiceProvider.php

@@ -83,8 +83,12 @@ class_alias('App\Models\Team', 'App\Team');
 
         // Middleware
         $router->aliasMiddleware('auth.laravel-crm', Authenticate::class);
-        $router->pushMiddlewareToGroup('crm', TeamsPermission::class);
-        $router->pushMiddlewareToGroup('api', TeamsPermission::class);
+        
+        if(config('laravel-crm.teams')){
+            $router->pushMiddlewareToGroup('web', TeamsPermission::class);
+            $router->pushMiddlewareToGroup('api', TeamsPermission::class); 
+        }
+        
         $router->pushMiddlewareToGroup('crm', Settings::class);
         $router->pushMiddlewareToGroup('api', Settings::class);
         $router->pushMiddlewareToGroup('crm', HasCrmAccess::class);

src/Observers/TeamObserver.php

@@ -32,6 +32,7 @@ public function created(Team $team)
 
         // Get the roles
         foreach (DB::table('roles')
+                     ->where('crm_role', 1)
                      ->whereNull('team_id')
                      ->get() as $role) {
             DB::table('roles')->updateOrInsert([
@@ -52,49 +53,14 @@ public function created(Team $team)
                 'crm_role' => $role->crm_role,
                 'team_id' => $team->id,
             ])->first()) {
-                if ($role->name == 'Owner') {
-                    if ((app()->version() >= 8 && class_exists('App\Models\User')) || (class_exists('App\Models\User') && ! class_exists('App\User'))) {
-                        DB::table('model_has_roles')->updateOrInsert([
-                            'role_id' => $newRole->id,
-                            'model_type' => 'App\Models\User',
-                            'model_id' => auth()->user()->id,
-                        ]);
-                    } else {
-                        DB::table('model_has_roles')->updateOrInsert([
-                            'role_id' => $newRole->id,
-                            'model_type' => 'App\User',
-                            'model_id' => auth()->user()->id,
-                        ]);
-                    }
-                }
-                
                 foreach (DB::table('permissions')
                              ->leftJoin('role_has_permissions', 'permissions.id', '=', 'role_has_permissions.permission_id')
                              ->where('role_has_permissions.role_id', $role->id)
                              ->get() as $permission) {
-                    DB::table('permissions')->updateOrInsert([
-                        'name' => $permission->name,
-                        'guard_name' => $permission->guard_name,
-                        'description' => $permission->description,
-                        'crm_permission' => $permission->crm_permission,
-                        'team_id' => $team->id,
-                    ], [
-                        'created_at' => Carbon::now(),
-                        'updated_at' => Carbon::now(),
+                    DB::table('role_has_permissions')->updateOrInsert([
+                        'permission_id' => $permission->id,
+                        'role_id' => $newRole->id,
                     ]);
-
-                    if ($newPermission = DB::table('permissions')->where([
-                        'name' => $permission->name,
-                        'guard_name' => $permission->guard_name,
-                        'description' => $permission->description,
-                        'crm_permission' => $permission->crm_permission,
-                        'team_id' => $team->id,
-                    ])->first()) {
-                        DB::table('role_has_permissions')->updateOrInsert([
-                            'permission_id' => $newPermission->id,
-                            'role_id' => $newRole->id,
-                        ]);
-                    }
                 }
             }
         }