feat(auth): implement permission-based access for scanner functionality and update related tests
This commit is contained in:
parent
3eaa3f8202
commit
7d9489169d
|
|
@ -53,6 +53,16 @@ class User extends Authenticatable
|
||||||
return $this->belongsTo(Role::class, 'rol_codigo', 'codigo');
|
return $this->belongsTo(Role::class, 'rol_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function hasPermission(string $permissionCode): bool
|
||||||
|
{
|
||||||
|
return $this->role()
|
||||||
|
->whereHas(
|
||||||
|
'permissions',
|
||||||
|
fn ($query) => $query->where('permisos.codigo', $permissionCode)
|
||||||
|
)
|
||||||
|
->exists();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return BelongsTo<Tenant, $this>
|
* @return BelongsTo<Tenant, $this>
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace App\Domains\Auth\Services;
|
||||||
use App\Domains\Auth\Exceptions\AccountLockedException;
|
use App\Domains\Auth\Exceptions\AccountLockedException;
|
||||||
use App\Domains\Auth\Models\LoginAttempt;
|
use App\Domains\Auth\Models\LoginAttempt;
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use Carbon\CarbonImmutable;
|
use Carbon\CarbonImmutable;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
@ -63,7 +64,7 @@ class PasswordLoginService
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Authenticate a tenant-bound scanner without requiring its tenant code.
|
* Authenticate a tenant-bound user authorized to scan tickets.
|
||||||
*
|
*
|
||||||
* @throws AccountLockedException
|
* @throws AccountLockedException
|
||||||
* @throws ValidationException
|
* @throws ValidationException
|
||||||
|
|
@ -80,8 +81,9 @@ class PasswordLoginService
|
||||||
null,
|
null,
|
||||||
$ipAddress,
|
$ipAddress,
|
||||||
$userAgent,
|
$userAgent,
|
||||||
RoleCode::Scanner,
|
null,
|
||||||
true,
|
true,
|
||||||
|
PermissionCode::ScanTickets->value,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -91,8 +93,9 @@ class PasswordLoginService
|
||||||
?string $tenantCode,
|
?string $tenantCode,
|
||||||
?string $ipAddress,
|
?string $ipAddress,
|
||||||
?string $userAgent,
|
?string $userAgent,
|
||||||
RoleCode $requiredRole = RoleCode::User,
|
?RoleCode $requiredRole = RoleCode::User,
|
||||||
bool $requiresTenant = false,
|
bool $requiresTenant = false,
|
||||||
|
?string $requiredPermission = null,
|
||||||
): User {
|
): User {
|
||||||
$normalizedEmail = mb_strtolower(trim($email));
|
$normalizedEmail = mb_strtolower(trim($email));
|
||||||
$now = CarbonImmutable::now();
|
$now = CarbonImmutable::now();
|
||||||
|
|
@ -107,10 +110,21 @@ class PasswordLoginService
|
||||||
$now,
|
$now,
|
||||||
$requiredRole,
|
$requiredRole,
|
||||||
$requiresTenant,
|
$requiresTenant,
|
||||||
|
$requiredPermission,
|
||||||
): array {
|
): array {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $normalizedEmail)
|
->where('email', $normalizedEmail)
|
||||||
->where('rol_codigo', $requiredRole->value)
|
->when(
|
||||||
|
$requiredRole !== null,
|
||||||
|
fn ($query) => $query->where('rol_codigo', $requiredRole->value),
|
||||||
|
)
|
||||||
|
->when(
|
||||||
|
$requiredPermission !== null,
|
||||||
|
fn ($query) => $query->whereHas(
|
||||||
|
'role.permissions',
|
||||||
|
fn ($query) => $query->where('permisos.codigo', $requiredPermission)
|
||||||
|
),
|
||||||
|
)
|
||||||
->when(
|
->when(
|
||||||
$requiresTenant,
|
$requiresTenant,
|
||||||
fn ($query) => $query->whereNotNull('tenant_codigo'),
|
fn ($query) => $query->whereNotNull('tenant_codigo'),
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
namespace App\Domains\Auth\Services;
|
namespace App\Domains\Auth\Services;
|
||||||
|
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
|
||||||
|
|
||||||
class ScannerContextService
|
class ScannerContextService
|
||||||
{
|
{
|
||||||
|
|
@ -13,7 +12,7 @@ class ScannerContextService
|
||||||
->with([
|
->with([
|
||||||
'menues' => fn ($query) => $query->whereHas(
|
'menues' => fn ($query) => $query->whereHas(
|
||||||
'roles',
|
'roles',
|
||||||
fn ($query) => $query->where('codigo', RoleCode::Scanner->value)
|
fn ($query) => $query->where('codigo', $user->rol_codigo)
|
||||||
),
|
),
|
||||||
])
|
])
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Authorization\Enums;
|
||||||
|
|
||||||
|
enum PermissionCode: string
|
||||||
|
{
|
||||||
|
case ScanTickets = 'tickets.escanear';
|
||||||
|
}
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Auth\Access\AuthorizationException;
|
use Illuminate\Auth\Access\AuthorizationException;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Response;
|
||||||
class EnsureScannerTenant
|
class EnsureScannerTenant
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Ensure the authenticated user is a scanner bound to a tenant.
|
* Ensure the authenticated user can scan tickets for a tenant.
|
||||||
*/
|
*/
|
||||||
public function handle(Request $request, Closure $next): Response
|
public function handle(Request $request, Closure $next): Response
|
||||||
{
|
{
|
||||||
|
|
@ -19,8 +19,8 @@ class EnsureScannerTenant
|
||||||
|
|
||||||
if (
|
if (
|
||||||
! $user
|
! $user
|
||||||
|| $user->rol_codigo !== RoleCode::Scanner->value
|
|
||||||
|| ! $user->tenant_codigo
|
|| ! $user->tenant_codigo
|
||||||
|
|| ! $user->hasPermission(PermissionCode::ScanTickets->value)
|
||||||
) {
|
) {
|
||||||
throw new AuthorizationException;
|
throw new AuthorizationException;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace Database\Seeders;
|
namespace Database\Seeders;
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Authorization\Models\Permission;
|
use App\Domains\Authorization\Models\Permission;
|
||||||
use App\Domains\Authorization\Models\Role;
|
use App\Domains\Authorization\Models\Role;
|
||||||
|
|
@ -81,7 +82,7 @@ class AuthorizationSeeder extends Seeder
|
||||||
'nombre' => 'Gestionar tickets',
|
'nombre' => 'Gestionar tickets',
|
||||||
'descripcion' => 'Permite emitir, invalidar o regenerar tickets.',
|
'descripcion' => 'Permite emitir, invalidar o regenerar tickets.',
|
||||||
],
|
],
|
||||||
'tickets.escanear' => [
|
PermissionCode::ScanTickets->value => [
|
||||||
'nombre' => 'Escanear tickets',
|
'nombre' => 'Escanear tickets',
|
||||||
'descripcion' => 'Permite validar y consumir tickets de las categorías asignadas al usuario.',
|
'descripcion' => 'Permite validar y consumir tickets de las categorías asignadas al usuario.',
|
||||||
],
|
],
|
||||||
|
|
@ -119,12 +120,12 @@ class AuthorizationSeeder extends Seeder
|
||||||
RoleCode::AdminApp->value => [
|
RoleCode::AdminApp->value => [
|
||||||
'nombre' => 'Administrador de la aplicación',
|
'nombre' => 'Administrador de la aplicación',
|
||||||
'descripcion' => 'Accede a los menús administrativos de la aplicación.',
|
'descripcion' => 'Accede a los menús administrativos de la aplicación.',
|
||||||
'permisos' => [],
|
'permisos' => [PermissionCode::ScanTickets->value],
|
||||||
],
|
],
|
||||||
RoleCode::Scanner->value => [
|
RoleCode::Scanner->value => [
|
||||||
'nombre' => 'Scanner',
|
'nombre' => 'Scanner',
|
||||||
'descripcion' => 'Valida y consume tickets de las categorías que tiene asignadas.',
|
'descripcion' => 'Valida y consume tickets de las categorías que tiene asignadas.',
|
||||||
'permisos' => ['tickets.escanear'],
|
'permisos' => [PermissionCode::ScanTickets->value],
|
||||||
],
|
],
|
||||||
RoleCode::User->value => [
|
RoleCode::User->value => [
|
||||||
'nombre' => 'Usuario',
|
'nombre' => 'Usuario',
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,9 @@
|
||||||
namespace Tests\Feature\Auth;
|
namespace Tests\Feature\Auth;
|
||||||
|
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
|
use App\Domains\Authorization\Models\Permission;
|
||||||
use App\Domains\Authorization\Models\Role;
|
use App\Domains\Authorization\Models\Role;
|
||||||
use App\Domains\Tenant\Models\Tenant;
|
use App\Domains\Tenant\Models\Tenant;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
|
@ -14,12 +16,17 @@ class ScannerLoginControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
use RefreshDatabase;
|
use RefreshDatabase;
|
||||||
|
|
||||||
public function test_it_logs_in_a_tenant_bound_scanner(): void
|
public function test_it_logs_in_a_tenant_bound_user_with_scan_permission(): void
|
||||||
{
|
{
|
||||||
$role = Role::query()->create([
|
$role = Role::query()->create([
|
||||||
'codigo' => RoleCode::Scanner->value,
|
'codigo' => RoleCode::AdminApp->value,
|
||||||
'nombre' => 'Scanner',
|
'nombre' => 'Operador',
|
||||||
]);
|
]);
|
||||||
|
$permission = Permission::query()->create([
|
||||||
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
|
'nombre' => 'Escanear tickets',
|
||||||
|
]);
|
||||||
|
$role->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = Tenant::query()->create([
|
||||||
'codigo' => 'acme',
|
'codigo' => 'acme',
|
||||||
'nombre' => 'Acme',
|
'nombre' => 'Acme',
|
||||||
|
|
@ -40,22 +47,28 @@ class ScannerLoginControllerTest extends TestCase
|
||||||
$response
|
$response
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonPath('user.id', $user->id)
|
->assertJsonPath('user.id', $user->id)
|
||||||
->assertJsonPath('user.rol_codigo', RoleCode::Scanner->value)
|
->assertJsonPath('user.rol_codigo', RoleCode::AdminApp->value)
|
||||||
->assertJsonPath('token_type', 'Bearer');
|
->assertJsonPath('token_type', 'Bearer');
|
||||||
|
|
||||||
$this->assertSame(['scanner'], $user->tokens()->sole()->abilities);
|
$this->assertSame(['scanner'], $user->tokens()->sole()->abilities);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_it_rejects_a_non_scanner_user(): void
|
public function test_it_rejects_a_user_without_scan_permission(): void
|
||||||
{
|
{
|
||||||
$role = Role::query()->create([
|
$role = Role::query()->create([
|
||||||
'codigo' => RoleCode::User->value,
|
'codigo' => RoleCode::Scanner->value,
|
||||||
'nombre' => 'Usuario',
|
'nombre' => 'Scanner sin permiso',
|
||||||
|
]);
|
||||||
|
$tenant = Tenant::query()->create([
|
||||||
|
'codigo' => 'acme',
|
||||||
|
'nombre' => 'Acme',
|
||||||
|
'dominio' => 'acme.test',
|
||||||
]);
|
]);
|
||||||
$user = User::factory()->create([
|
$user = User::factory()->create([
|
||||||
'email' => 'customer@example.com',
|
'email' => 'customer@example.com',
|
||||||
'password' => Hash::make('secret123'),
|
'password' => Hash::make('secret123'),
|
||||||
'rol_codigo' => $role->codigo,
|
'rol_codigo' => $role->codigo,
|
||||||
|
'tenant_codigo' => $tenant->codigo,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->postJson('/api/v1/scanner/login', [
|
$this->postJson('/api/v1/scanner/login', [
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,9 @@
|
||||||
namespace Tests\Feature\Auth;
|
namespace Tests\Feature\Auth;
|
||||||
|
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
|
use App\Domains\Authorization\Models\Permission;
|
||||||
use App\Domains\Authorization\Models\Role;
|
use App\Domains\Authorization\Models\Role;
|
||||||
use App\Domains\Menu\Models\Menu;
|
use App\Domains\Menu\Models\Menu;
|
||||||
use App\Domains\Tenant\Models\Tenant;
|
use App\Domains\Tenant\Models\Tenant;
|
||||||
|
|
@ -21,6 +23,11 @@ class ScannerMeControllerTest extends TestCase
|
||||||
'codigo' => RoleCode::Scanner->value,
|
'codigo' => RoleCode::Scanner->value,
|
||||||
'nombre' => 'Scanner',
|
'nombre' => 'Scanner',
|
||||||
]);
|
]);
|
||||||
|
$permission = Permission::query()->create([
|
||||||
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
|
'nombre' => 'Escanear tickets',
|
||||||
|
]);
|
||||||
|
$scannerRole->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = Tenant::query()->create([
|
||||||
'codigo' => 'acme',
|
'codigo' => 'acme',
|
||||||
'nombre' => 'Acme',
|
'nombre' => 'Acme',
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace Tests\Feature\Seeders;
|
namespace Tests\Feature\Seeders;
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Authorization\Models\Permission;
|
use App\Domains\Authorization\Models\Permission;
|
||||||
use App\Domains\Authorization\Models\Role;
|
use App\Domains\Authorization\Models\Role;
|
||||||
|
|
@ -21,6 +22,7 @@ class AuthorizationSeederTest extends TestCase
|
||||||
[
|
[
|
||||||
RoleCode::Admin->value,
|
RoleCode::Admin->value,
|
||||||
RoleCode::AdminApp->value,
|
RoleCode::AdminApp->value,
|
||||||
|
RoleCode::Scanner->value,
|
||||||
RoleCode::User->value,
|
RoleCode::User->value,
|
||||||
],
|
],
|
||||||
Role::query()->orderBy('codigo')->pluck('codigo')->all()
|
Role::query()->orderBy('codigo')->pluck('codigo')->all()
|
||||||
|
|
@ -34,10 +36,15 @@ class AuthorizationSeederTest extends TestCase
|
||||||
|
|
||||||
$admin = Role::query()->where('codigo', RoleCode::Admin->value)->firstOrFail();
|
$admin = Role::query()->where('codigo', RoleCode::Admin->value)->firstOrFail();
|
||||||
$appAdmin = Role::query()->where('codigo', RoleCode::AdminApp->value)->firstOrFail();
|
$appAdmin = Role::query()->where('codigo', RoleCode::AdminApp->value)->firstOrFail();
|
||||||
|
$scanner = Role::query()->where('codigo', RoleCode::Scanner->value)->firstOrFail();
|
||||||
$user = Role::query()->where('codigo', RoleCode::User->value)->firstOrFail();
|
$user = Role::query()->where('codigo', RoleCode::User->value)->firstOrFail();
|
||||||
|
|
||||||
$this->assertCount(22, $admin->permissions);
|
$this->assertCount(22, $admin->permissions);
|
||||||
$this->assertCount(0, $appAdmin->permissions);
|
$this->assertCount(0, $appAdmin->permissions);
|
||||||
|
$this->assertSame(
|
||||||
|
[PermissionCode::ScanTickets->value],
|
||||||
|
$scanner->permissions->pluck('codigo')->all()
|
||||||
|
);
|
||||||
$this->assertCount(0, $user->permissions);
|
$this->assertCount(0, $user->permissions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -46,8 +53,8 @@ class AuthorizationSeederTest extends TestCase
|
||||||
$this->seed(AuthorizationSeeder::class);
|
$this->seed(AuthorizationSeeder::class);
|
||||||
$this->seed(AuthorizationSeeder::class);
|
$this->seed(AuthorizationSeeder::class);
|
||||||
|
|
||||||
$this->assertCount(3, Role::query()->get());
|
$this->assertCount(4, Role::query()->get());
|
||||||
$this->assertCount(22, Permission::query()->get());
|
$this->assertCount(22, Permission::query()->get());
|
||||||
$this->assertDatabaseCount('roles_permisos', 22);
|
$this->assertDatabaseCount('roles_permisos', 23);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ class ScannerTicketControllerTest extends TestCase
|
||||||
$this->scanner->scanCategories()->attach($this->category);
|
$this->scanner->scanCategories()->attach($this->category);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_scanner_routes_require_authentication_and_scanner_role(): void
|
public function test_scanner_routes_require_authentication_and_scan_permission(): void
|
||||||
{
|
{
|
||||||
$this->getJson('/api/v1/scanner/tickets')->assertUnauthorized();
|
$this->getJson('/api/v1/scanner/tickets')->assertUnauthorized();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue