feat: implement multi-tenancy and super admin impersonation with security banner
This commit is contained in:
@@ -3,9 +3,11 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class Agent extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
protected $fillable = [
|
||||
'first_name',
|
||||
'last_name',
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class Attachment extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
protected $fillable = [
|
||||
'service_task_id',
|
||||
'filename',
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class Comment extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
protected $fillable = ['user_id', 'content', 'commentable_id', 'commentable_type'];
|
||||
|
||||
public function user()
|
||||
|
||||
@@ -5,10 +5,11 @@ namespace App\Models;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Spatie\Activitylog\Traits\LogsActivity;
|
||||
use Spatie\Activitylog\LogOptions;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class IntegrationRequest extends Model
|
||||
{
|
||||
use LogsActivity;
|
||||
use LogsActivity, BelongsToStructure;
|
||||
|
||||
public function getActivitylogOptions(): LogOptions
|
||||
{
|
||||
|
||||
@@ -3,9 +3,12 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class IntegrationTemplate extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'description',
|
||||
|
||||
@@ -3,9 +3,12 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class Service extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'code',
|
||||
|
||||
@@ -5,10 +5,11 @@ namespace App\Models;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Spatie\Activitylog\Traits\LogsActivity;
|
||||
use Spatie\Activitylog\LogOptions;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class ServiceTask extends Model
|
||||
{
|
||||
use LogsActivity;
|
||||
use LogsActivity, BelongsToStructure;
|
||||
|
||||
public function getActivitylogOptions(): LogOptions
|
||||
{
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class TaskItem extends Model
|
||||
{
|
||||
use BelongsToStructure;
|
||||
protected $fillable = [
|
||||
'service_task_id',
|
||||
'label',
|
||||
|
||||
@@ -8,11 +8,14 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
use App\Traits\BelongsToStructure;
|
||||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\UserFactory> */
|
||||
use HasFactory, Notifiable, HasRoles;
|
||||
use HasFactory, Notifiable, BelongsToStructure;
|
||||
use HasRoles {
|
||||
hasRole as traitHasRole;
|
||||
}
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
@@ -23,6 +26,7 @@ class User extends Authenticatable
|
||||
'name',
|
||||
'email',
|
||||
'password',
|
||||
'structure_id',
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -47,4 +51,29 @@ class User extends Authenticatable
|
||||
'password' => 'hashed',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Override de Spatie HasRoles pour qu'un SuperAdmin valide toutes les vérifications de rôle
|
||||
* Cela permet notamment de parcourir les locataires (Tenant) sans être bloqué par les "hasRole('Admin')"
|
||||
*/
|
||||
public function hasRole($roles, string $guard = null): bool
|
||||
{
|
||||
// Si on ne demande pas explicitement le rôle SuperAdmin, on vérifie si l'utilisateur l'a globalement.
|
||||
// On passe par DB::table pour éviter que le GlobalScope 'structure' ne filtre nos propres rôles
|
||||
// lorsqu'on est en train de simuler une autre structure.
|
||||
if ($roles !== 'SuperAdmin') {
|
||||
$isSuperAdmin = \Illuminate\Support\Facades\DB::table('model_has_roles')
|
||||
->join('roles', 'roles.id', '=', 'model_has_roles.role_id')
|
||||
->where('model_has_roles.model_id', $this->id)
|
||||
->where('model_has_roles.model_type', self::class)
|
||||
->where('roles.name', 'SuperAdmin')
|
||||
->exists();
|
||||
|
||||
if ($isSuperAdmin) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->traitHasRole($roles, $guard);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user