Merge branch 'roles' into 'main' (9eb3cdef) · Commits · Alfonso Rafael Solis Rangel / AgendaGobernador

app/Models/User.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		use Laravel\Fortify\TwoFactorAuthenticatable;
		use Laravel\Jetstream\HasProfilePhoto;
		use Laravel\Sanctum\HasApiTokens;
		use Spatie\Permission\Traits\HasRoles;

		class User extends Authenticatable
		{
		@@ -17,6 +18,7 @@ class User extends Authenticatable
		use HasProfilePhoto;
		use Notifiable;
		use TwoFactorAuthenticatable;
		use HasRoles;

		/**
		* The attributes that are mass assignable.

composer.json

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,8 @@
		"laravel/jetstream": "^5.1",
		"laravel/sanctum": "^4.0",
		"laravel/tinker": "^2.9",
		"livewire/livewire": "^3.0"
		"livewire/livewire": "^3.0",
		"spatie/laravel-permission": "^6.7"
		},
		"require-dev": {
		"fakerphp/faker": "^1.23",

composer.lock

+83 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
		"This file is @generated automatically"
		],
		"content-hash": "10662401f38aae1c72be9472ee8681a5",
		"content-hash": "9a2ffcfd337b3ea63443b0e0eeb3e331",
		"packages": [
		{
		"name": "bacon/bacon-qr-code",
		@@ -3666,6 +3666,88 @@
		],
		"time": "2024-04-27T21:32:50+00:00"
		},
		{
		"name": "spatie/laravel-permission",
		"version": "6.7.0",
		"source": {
		"type": "git",
		"url": "https://github.com/spatie/laravel-permission.git",
		"reference": "17607924aa0aa89bc0153c2ce45ed7c55083367b"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/spatie/laravel-permission/zipball/17607924aa0aa89bc0153c2ce45ed7c55083367b",
		"reference": "17607924aa0aa89bc0153c2ce45ed7c55083367b",
		"shasum": ""
		},
		"require": {
		"illuminate/auth": "^8.12\|^9.0\|^10.0\|^11.0",
		"illuminate/container": "^8.12\|^9.0\|^10.0\|^11.0",
		"illuminate/contracts": "^8.12\|^9.0\|^10.0\|^11.0",
		"illuminate/database": "^8.12\|^9.0\|^10.0\|^11.0",
		"php": "^8.0"
		},
		"require-dev": {
		"laravel/passport": "^11.0\|^12.0",
		"orchestra/testbench": "^6.23\|^7.0\|^8.0\|^9.0",
		"phpunit/phpunit": "^9.4\|^10.1"
		},
		"type": "library",
		"extra": {
		"branch-alias": {
		"dev-main": "6.x-dev",
		"dev-master": "6.x-dev"
		},
		"laravel": {
		"providers": [
		"Spatie\\Permission\\PermissionServiceProvider"
		]
		}
		},
		"autoload": {
		"files": [
		"src/helpers.php"
		],
		"psr-4": {
		"Spatie\\Permission\\": "src"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Freek Van der Herten",
		"email": "freek@spatie.be",
		"homepage": "https://spatie.be",
		"role": "Developer"
		}
		],
		"description": "Permission handling for Laravel 8.0 and up",
		"homepage": "https://github.com/spatie/laravel-permission",
		"keywords": [
		"acl",
		"laravel",
		"permission",
		"permissions",
		"rbac",
		"roles",
		"security",
		"spatie"
		],
		"support": {
		"issues": "https://github.com/spatie/laravel-permission/issues",
		"source": "https://github.com/spatie/laravel-permission/tree/6.7.0"
		},
		"funding": [
		{
		"url": "https://github.com/spatie",
		"type": "github"
		}
		],
		"time": "2024-04-19T12:35:28+00:00"
		},
		{
		"name": "symfony/clock",
		"version": "v7.0.7",

config/permission.php

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		<?php

		return [

		'models' => [

		/*
		* When using the "HasPermissions" trait from this package, we need to know which
		* Eloquent model should be used to retrieve your permissions. Of course, it
		* is often just the "Permission" model but you may use whatever you like.
		*
		* The model you want to use as a Permission model needs to implement the
		* `Spatie\Permission\Contracts\Permission` contract.
		*/

		'permission' => Spatie\Permission\Models\Permission::class,

		/*
		* When using the "HasRoles" trait from this package, we need to know which
		* Eloquent model should be used to retrieve your roles. Of course, it
		* is often just the "Role" model but you may use whatever you like.
		*
		* The model you want to use as a Role model needs to implement the
		* `Spatie\Permission\Contracts\Role` contract.
		*/

		'role' => Spatie\Permission\Models\Role::class,

		],

		'table_names' => [

		/*
		* When using the "HasRoles" trait from this package, we need to know which
		* table should be used to retrieve your roles. We have chosen a basic
		* default value but you may easily change it to any table you like.
		*/

		'roles' => 'roles',

		/*
		* When using the "HasPermissions" trait from this package, we need to know which
		* table should be used to retrieve your permissions. We have chosen a basic
		* default value but you may easily change it to any table you like.
		*/

		'permissions' => 'permissions',

		/*
		* When using the "HasPermissions" trait from this package, we need to know which
		* table should be used to retrieve your models permissions. We have chosen a
		* basic default value but you may easily change it to any table you like.
		*/

		'model_has_permissions' => 'model_has_permissions',

		/*
		* When using the "HasRoles" trait from this package, we need to know which
		* table should be used to retrieve your models roles. We have chosen a
		* basic default value but you may easily change it to any table you like.
		*/

		'model_has_roles' => 'model_has_roles',

		/*
		* When using the "HasRoles" trait from this package, we need to know which
		* table should be used to retrieve your roles permissions. We have chosen a
		* basic default value but you may easily change it to any table you like.
		*/

		'role_has_permissions' => 'role_has_permissions',
		],

		'column_names' => [
		/*
		* Change this if you want to name the related pivots other than defaults
		*/
		'role_pivot_key' => null, //default 'role_id',
		'permission_pivot_key' => null, //default 'permission_id',

		/*
		* Change this if you want to name the related model primary key other than
		* `model_id`.
		*
		* For example, this would be nice if your primary keys are all UUIDs. In
		* that case, name this `model_uuid`.
		*/

		'model_morph_key' => 'model_id',

		/*
		* Change this if you want to use the teams feature and your related model's
		* foreign key is other than `team_id`.
		*/

		'team_foreign_key' => 'team_id',
		],

		/*
		* When set to true, the method for checking permissions will be registered on the gate.
		* Set this to false if you want to implement custom logic for checking permissions.
		*/

		'register_permission_check_method' => true,

		/*
		* When set to true, Laravel\Octane\Events\OperationTerminated event listener will be registered
		* this will refresh permissions on every TickTerminated, TaskTerminated and RequestTerminated
		* NOTE: This should not be needed in most cases, but an Octane/Vapor combination benefited from it.
		*/
		'register_octane_reset_listener' => false,

		/*
		* Teams Feature.
		* When set to true the package implements teams using the 'team_foreign_key'.
		* If you want the migrations to register the 'team_foreign_key', you must
		* set this to true before doing the migration.
		* If you already did the migration then you must make a new migration to also
		* add 'team_foreign_key' to 'roles', 'model_has_roles', and 'model_has_permissions'
		* (view the latest version of this package's migration file)
		*/

		'teams' => false,

		/*
		* Passport Client Credentials Grant
		* When set to true the package will use Passports Client to check permissions
		*/

		'use_passport_client_credentials' => false,

		/*
		* When set to true, the required permission names are added to exception messages.
		* This could be considered an information leak in some contexts, so the default
		* setting is false here for optimum safety.
		*/

		'display_permission_in_exception' => false,

		/*
		* When set to true, the required role names are added to exception messages.
		* This could be considered an information leak in some contexts, so the default
		* setting is false here for optimum safety.
		*/

		'display_role_in_exception' => false,

		/*
		* By default wildcard permission lookups are disabled.
		* See documentation to understand supported syntax.
		*/

		'enable_wildcard_permission' => false,

		/*
		* The class to use for interpreting wildcard permissions.
		* If you need to modify delimiters, override the class and specify its name here.
		*/
		// 'permission.wildcard_permission' => Spatie\Permission\WildcardPermission::class,

		/* Cache-specific settings */

		'cache' => [

		/*
		* By default all permissions are cached for 24 hours to speed up performance.
		* When permissions or roles are updated the cache is flushed automatically.
		*/

		'expiration_time' => \DateInterval::createFromDateString('24 hours'),

		/*
		* The cache key used to store all permissions.
		*/

		'key' => 'spatie.permission.cache',

		/*
		* You may optionally indicate a specific cache driver to use for permission and
		* role caching using any of the `store` drivers listed in the cache.php config
		* file. Using 'default' here means to use the `default` set in cache.php.
		*/

		'store' => 'default',
		],
		];

database/migrations/2024_06_03_190051_create_permission_tables.php

0 → 100644

+138 −0

Original line number	Diff line number	Diff line
		<?php

		use Illuminate\Support\Facades\Schema;
		use Illuminate\Database\Schema\Blueprint;
		use Illuminate\Database\Migrations\Migration;

		return new class extends Migration
		{
		/**
		* Run the migrations.
		*/
		public function up(): void
		{
		$teams = config('permission.teams');
		$tableNames = config('permission.table_names');
		$columnNames = config('permission.column_names');
		$pivotRole = $columnNames['role_pivot_key'] ?? 'role_id';
		$pivotPermission = $columnNames['permission_pivot_key'] ?? 'permission_id';

		if (empty($tableNames)) {
		throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
		}
		if ($teams && empty($columnNames['team_foreign_key'] ?? null)) {
		throw new \Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.');
		}

		Schema::create($tableNames['permissions'], function (Blueprint $table) {
		$table->bigIncrements('id'); // permission id
		$table->string('name'); // For MySQL 8.0 use string('name', 125);
		$table->string('guard_name'); // For MySQL 8.0 use string('guard_name', 125);
		$table->timestamps();

		$table->unique(['name', 'guard_name']);
		});

		Schema::create($tableNames['roles'], function (Blueprint $table) use ($teams, $columnNames) {
		$table->bigIncrements('id'); // role id
		if ($teams \|\| config('permission.testing')) { // permission.testing is a fix for sqlite testing
		$table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable();
		$table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index');
		}
		$table->string('name'); // For MySQL 8.0 use string('name', 125);
		$table->string('guard_name'); // For MySQL 8.0 use string('guard_name', 125);
		$table->timestamps();
		if ($teams \|\| config('permission.testing')) {
		$table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']);
		} else {
		$table->unique(['name', 'guard_name']);
		}
		});

		Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) {
		$table->unsignedBigInteger($pivotPermission);

		$table->string('model_type');
		$table->unsignedBigInteger($columnNames['model_morph_key']);
		$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index');

		$table->foreign($pivotPermission)
		->references('id') // permission id
		->on($tableNames['permissions'])
		->onDelete('cascade');
		if ($teams) {
		$table->unsignedBigInteger($columnNames['team_foreign_key']);
		$table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index');

		$table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'],
		'model_has_permissions_permission_model_type_primary');
		} else {
		$table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
		'model_has_permissions_permission_model_type_primary');
		}

		});

		Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) {
		$table->unsignedBigInteger($pivotRole);

		$table->string('model_type');
		$table->unsignedBigInteger($columnNames['model_morph_key']);
		$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index');

		$table->foreign($pivotRole)
		->references('id') // role id
		->on($tableNames['roles'])
		->onDelete('cascade');
		if ($teams) {
		$table->unsignedBigInteger($columnNames['team_foreign_key']);
		$table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index');

		$table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'],
		'model_has_roles_role_model_type_primary');
		} else {
		$table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'],
		'model_has_roles_role_model_type_primary');
		}
		});

		Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) {
		$table->unsignedBigInteger($pivotPermission);
		$table->unsignedBigInteger($pivotRole);

		$table->foreign($pivotPermission)
		->references('id') // permission id
		->on($tableNames['permissions'])
		->onDelete('cascade');

		$table->foreign($pivotRole)
		->references('id') // role id
		->on($tableNames['roles'])
		->onDelete('cascade');

		$table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary');
		});

		app('cache')
		->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
		->forget(config('permission.cache.key'));
		}

		/**
		* Reverse the migrations.
		*/
		public function down(): void
		{
		$tableNames = config('permission.table_names');

		if (empty($tableNames)) {
		throw new \Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.');
		}

		Schema::drop($tableNames['role_has_permissions']);
		Schema::drop($tableNames['model_has_roles']);
		Schema::drop($tableNames['model_has_permissions']);
		Schema::drop($tableNames['roles']);
		Schema::drop($tableNames['permissions']);
		}
		};