Compare commits
5 Commits
e4db36e650
...
a4b5c2eb19
| Author | SHA1 | Date | |
|---|---|---|---|
| a4b5c2eb19 | |||
| 2feca2bed5 | |||
| a35ff69140 | |||
| 75152b53a4 | |||
| 99594b17e7 |
@@ -31,7 +31,7 @@ class StoreAdministratorRequest extends FormRequest
|
|||||||
'required',
|
'required',
|
||||||
'email',
|
'email',
|
||||||
'max:255',
|
'max:255',
|
||||||
Rule::unique('users', 'email')->whereNull('deleted_at'),
|
Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::AdminApp->value)->whereNull('deleted_at'),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class UpdateAdministratorRequest extends FormRequest
|
|||||||
'required',
|
'required',
|
||||||
'email',
|
'email',
|
||||||
'max:255',
|
'max:255',
|
||||||
Rule::unique('users', 'email')
|
Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::AdminApp->value)
|
||||||
->whereNull('deleted_at')
|
->whereNull('deleted_at')
|
||||||
->ignore($administratorId),
|
->ignore($administratorId),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Auth\Controllers;
|
|||||||
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Auth\Requests\ResetPasswordRequest;
|
use App\Domains\Auth\Requests\ResetPasswordRequest;
|
||||||
use App\Domains\Auth\Services\ResetPasswordAttemptService;
|
use App\Domains\Auth\Services\ResetPasswordAttemptService;
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
@@ -26,6 +27,7 @@ class ResetPasswordController extends Controller
|
|||||||
$data['email'],
|
$data['email'],
|
||||||
$data['codigo'],
|
$data['codigo'],
|
||||||
$data['password'],
|
$data['password'],
|
||||||
|
RoleCode::from($request->route('reset_role', RoleCode::User->value)),
|
||||||
)) {
|
)) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
'codigo' => __('api.auth.password_reset_invalid'),
|
'codigo' => __('api.auth.password_reset_invalid'),
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Auth\Controllers;
|
|||||||
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Auth\Requests\ValidateResetPasswordAttemptRequest;
|
use App\Domains\Auth\Requests\ValidateResetPasswordAttemptRequest;
|
||||||
use App\Domains\Auth\Services\ResetPasswordAttemptService;
|
use App\Domains\Auth\Services\ResetPasswordAttemptService;
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
@@ -25,6 +26,7 @@ class ValidateResetPasswordAttemptController extends Controller
|
|||||||
$result = $this->resetPasswordAttemptService->validateCode(
|
$result = $this->resetPasswordAttemptService->validateCode(
|
||||||
$data['email'],
|
$data['email'],
|
||||||
$data['codigo'],
|
$data['codigo'],
|
||||||
|
RoleCode::from($request->route('reset_role', RoleCode::User->value)),
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($result === ResetPasswordAttemptService::CODE_EXPIRED) {
|
if ($result === ResetPasswordAttemptService::CODE_EXPIRED) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Auth\Requests;
|
namespace App\Domains\Auth\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Illuminate\Validation\Rules\Password;
|
use Illuminate\Validation\Rules\Password;
|
||||||
@@ -13,9 +14,14 @@ class RegisterUserRequest extends FormRequest
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
protected function prepareForValidation(): void
|
||||||
* @return array<string, mixed>
|
{
|
||||||
*/
|
if (is_string($this->input('email'))) {
|
||||||
|
$this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
@@ -26,7 +32,7 @@ class RegisterUserRequest extends FormRequest
|
|||||||
'string',
|
'string',
|
||||||
'email',
|
'email',
|
||||||
'max:255',
|
'max:255',
|
||||||
Rule::unique('users', 'email')->whereNull('deleted_at'),
|
Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::User->value)->whereNull('deleted_at'),
|
||||||
],
|
],
|
||||||
'password' => ['required', 'string', 'confirmed', Password::min(8)->mixedCase()->symbols()],
|
'password' => ['required', 'string', 'confirmed', Password::min(8)->mixedCase()->symbols()],
|
||||||
'dni' => ['nullable', 'string', 'max:255'],
|
'dni' => ['nullable', 'string', 'max:255'],
|
||||||
|
|||||||
@@ -13,6 +13,13 @@ class UpdateProfileRequest extends FormRequest
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function prepareForValidation(): void
|
||||||
|
{
|
||||||
|
if (is_string($this->input('email'))) {
|
||||||
|
$this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
@@ -20,7 +27,7 @@ class UpdateProfileRequest extends FormRequest
|
|||||||
'email' => [
|
'email' => [
|
||||||
'required',
|
'required',
|
||||||
'email',
|
'email',
|
||||||
Rule::unique('users', 'email')
|
Rule::unique('users', 'active_email')->where('rol_codigo', $this->user()->rol_codigo)
|
||||||
->whereNull('deleted_at')
|
->whereNull('deleted_at')
|
||||||
->ignore($this->user()->id),
|
->ignore($this->user()->id),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class AdminCredentialVerifier
|
|||||||
public function verify(string $email, string $password): bool
|
public function verify(string $email, string $password): bool
|
||||||
{
|
{
|
||||||
$admin = User::query()
|
$admin = User::query()
|
||||||
->where('email', mb_strtolower(trim($email)))
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
->where('rol_codigo', RoleCode::Admin->value)
|
->where('rol_codigo', RoleCode::Admin->value)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
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;
|
||||||
use App\Domains\Notification\Events\UserRegistered;
|
use App\Domains\Notification\Events\UserRegistered;
|
||||||
use App\Domains\Tenant\Models\Tenant;
|
use App\Domains\Tenant\Models\Tenant;
|
||||||
use App\Domains\Tenant\Support\TenantDomainNormalizer;
|
use App\Domains\Tenant\Support\TenantDomainNormalizer;
|
||||||
@@ -124,12 +125,12 @@ class GoogleAuthService
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = User::query()->where('google_id', $googleId)->first();
|
$user = User::query()->where('rol_codigo', RoleCode::User->value)->where('google_id', $googleId)->first();
|
||||||
if ($user) {
|
if ($user) {
|
||||||
return $user;
|
return $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = User::query()->where('email', $email)->first();
|
$user = User::query()->where('rol_codigo', RoleCode::User->value)->where('active_email', mb_strtolower(trim($email)))->first();
|
||||||
if ($user) {
|
if ($user) {
|
||||||
$user->forceFill(['google_id' => $googleId])->save();
|
$user->forceFill(['google_id' => $googleId])->save();
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ class PasswordLoginService
|
|||||||
null,
|
null,
|
||||||
$ipAddress,
|
$ipAddress,
|
||||||
$userAgent,
|
$userAgent,
|
||||||
null,
|
RoleCode::Scanner,
|
||||||
true,
|
true,
|
||||||
PermissionCode::ScanTickets->value,
|
PermissionCode::ScanTickets->value,
|
||||||
PasswordResetRequested::CHANNEL_SCANNER,
|
PasswordResetRequested::CHANNEL_SCANNER,
|
||||||
@@ -120,7 +120,7 @@ class PasswordLoginService
|
|||||||
$passwordResetChannel,
|
$passwordResetChannel,
|
||||||
): array {
|
): array {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $normalizedEmail)
|
->where('active_email', $normalizedEmail)
|
||||||
->when(
|
->when(
|
||||||
$requiredRole !== null,
|
$requiredRole !== null,
|
||||||
fn ($query) => $query->where('rol_codigo', $requiredRole->value),
|
fn ($query) => $query->where('rol_codigo', $requiredRole->value),
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ class ResetPasswordAttemptService
|
|||||||
try {
|
try {
|
||||||
$attemptId = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?int {
|
$attemptId = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?int {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $email)
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
|
->where('rol_codigo', RoleCode::User->value)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ class ResetPasswordAttemptService
|
|||||||
try {
|
try {
|
||||||
$result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
|
$result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $email)
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
->where('rol_codigo', RoleCode::AdminApp->value)
|
->where('rol_codigo', RoleCode::AdminApp->value)
|
||||||
->whereNotNull('tenant_codigo')
|
->whereNotNull('tenant_codigo')
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
@@ -113,7 +114,7 @@ class ResetPasswordAttemptService
|
|||||||
try {
|
try {
|
||||||
$result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
|
$result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $email)
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
->where('rol_codigo', RoleCode::Scanner->value)
|
->where('rol_codigo', RoleCode::Scanner->value)
|
||||||
->whereNotNull('tenant_codigo')
|
->whereNotNull('tenant_codigo')
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
@@ -152,14 +153,15 @@ class ResetPasswordAttemptService
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function validateCode(string $email, string $code): string
|
public function validateCode(string $email, string $code, RoleCode $role = RoleCode::User): string
|
||||||
{
|
{
|
||||||
$emailFingerprint = $this->emailFingerprint($email);
|
$emailFingerprint = $this->emailFingerprint($email);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return DB::transaction(function () use ($email, $code, $emailFingerprint): string {
|
return DB::transaction(function () use ($email, $code, $emailFingerprint, $role): string {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $email)
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
|
->where('rol_codigo', $role->value)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
@@ -207,14 +209,15 @@ class ResetPasswordAttemptService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function resetPassword(string $email, string $code, string $password): bool
|
public function resetPassword(string $email, string $code, string $password, RoleCode $role = RoleCode::User): bool
|
||||||
{
|
{
|
||||||
$emailFingerprint = $this->emailFingerprint($email);
|
$emailFingerprint = $this->emailFingerprint($email);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return DB::transaction(function () use ($email, $code, $password, $emailFingerprint): bool {
|
return DB::transaction(function () use ($email, $code, $password, $emailFingerprint, $role): bool {
|
||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where('email', $email)
|
->where('active_email', mb_strtolower(trim($email)))
|
||||||
|
->where('rol_codigo', $role->value)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,10 @@ Route::prefix('v1/adminapp')->group(function (): void {
|
|||||||
Route::post('password/reset-attempts', CreateAdminAppResetPasswordAttemptController::class)
|
Route::post('password/reset-attempts', CreateAdminAppResetPasswordAttemptController::class)
|
||||||
->middleware('throttle:5,1');
|
->middleware('throttle:5,1');
|
||||||
Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
|
Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
|
||||||
|
->defaults('reset_role', 'adminapp')
|
||||||
->middleware('throttle:10,1');
|
->middleware('throttle:10,1');
|
||||||
Route::post('password/reset', ResetPasswordController::class)
|
Route::post('password/reset', ResetPasswordController::class)
|
||||||
|
->defaults('reset_role', 'adminapp')
|
||||||
->middleware('throttle:5,1');
|
->middleware('throttle:5,1');
|
||||||
Route::middleware(['auth:sanctum', 'adminapp.tenant'])
|
Route::middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->get('me', AdminAppMeController::class);
|
->get('me', AdminAppMeController::class);
|
||||||
|
|||||||
@@ -12,8 +12,10 @@ Route::prefix('v1/scanner')->group(function (): void {
|
|||||||
Route::post('password/reset-attempts', CreateScannerResetPasswordAttemptController::class)
|
Route::post('password/reset-attempts', CreateScannerResetPasswordAttemptController::class)
|
||||||
->middleware('throttle:5,1');
|
->middleware('throttle:5,1');
|
||||||
Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
|
Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
|
||||||
|
->defaults('reset_role', 'scanner')
|
||||||
->middleware('throttle:10,1');
|
->middleware('throttle:10,1');
|
||||||
Route::post('password/reset', ResetPasswordController::class)
|
Route::post('password/reset', ResetPasswordController::class)
|
||||||
|
->defaults('reset_role', 'scanner')
|
||||||
->middleware('throttle:5,1');
|
->middleware('throttle:5,1');
|
||||||
Route::middleware(['auth:sanctum', 'scanner.tenant'])
|
Route::middleware(['auth:sanctum', 'scanner.tenant'])
|
||||||
->get('me', ScannerMeController::class);
|
->get('me', ScannerMeController::class);
|
||||||
|
|||||||
@@ -105,7 +105,8 @@ class InvitationPurchaseProvisioner
|
|||||||
private function userId(DateTimeInterface $now): int
|
private function userId(DateTimeInterface $now): int
|
||||||
{
|
{
|
||||||
$user = DB::table('users')
|
$user = DB::table('users')
|
||||||
->where('email', self::USER_EMAIL)
|
->where('active_email', self::USER_EMAIL)
|
||||||
|
->where('rol_codigo', 'user')
|
||||||
->whereNull('deleted_at')
|
->whereNull('deleted_at')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Staff\Requests;
|
namespace App\Domains\Staff\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
@@ -12,6 +13,13 @@ class StoreStaffRequest extends FormRequest
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function prepareForValidation(): void
|
||||||
|
{
|
||||||
|
if (is_string($this->input('email'))) {
|
||||||
|
$this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** @return array<string, mixed> */
|
/** @return array<string, mixed> */
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
@@ -27,7 +35,7 @@ class StoreStaffRequest extends FormRequest
|
|||||||
'required',
|
'required',
|
||||||
'email',
|
'email',
|
||||||
'max:255',
|
'max:255',
|
||||||
Rule::unique('users', 'email')->whereNull('deleted_at'),
|
Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::Scanner->value)->whereNull('deleted_at'),
|
||||||
],
|
],
|
||||||
'category_ids' => $categoryRules,
|
'category_ids' => $categoryRules,
|
||||||
'category_ids.*' => ['integer', 'distinct', Rule::exists('categorias', 'id')],
|
'category_ids.*' => ['integer', 'distinct', Rule::exists('categorias', 'id')],
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Staff\Requests;
|
namespace App\Domains\Staff\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
@@ -12,6 +13,13 @@ class UpdateStaffRequest extends FormRequest
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function prepareForValidation(): void
|
||||||
|
{
|
||||||
|
if (is_string($this->input('email'))) {
|
||||||
|
$this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** @return array<string, mixed> */
|
/** @return array<string, mixed> */
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
@@ -28,7 +36,7 @@ class UpdateStaffRequest extends FormRequest
|
|||||||
'required',
|
'required',
|
||||||
'email',
|
'email',
|
||||||
'max:255',
|
'max:255',
|
||||||
Rule::unique('users', 'email')
|
Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::Scanner->value)
|
||||||
->whereNull('deleted_at')
|
->whereNull('deleted_at')
|
||||||
->ignore($staffId),
|
->ignore($staffId),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
namespace App\Domains\Ticket\Services;
|
namespace App\Domains\Ticket\Services;
|
||||||
|
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
|
||||||
use App\Domains\Ticket\Models\Ticket;
|
use App\Domains\Ticket\Models\Ticket;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
@@ -173,7 +172,6 @@ class ScannerTicketService
|
|||||||
|
|
||||||
private function requiresCategoryValidation(User $scanner): bool
|
private function requiresCategoryValidation(User $scanner): bool
|
||||||
{
|
{
|
||||||
return $scanner->rol_codigo !== RoleCode::AdminApp->value
|
return $scanner->tenant()->firstOrFail()->requiresScannerCategoryValidation();
|
||||||
&& $scanner->tenant()->firstOrFail()->requiresScannerCategoryValidation();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
use App\Domains\Authorization\Enums\PermissionCode;
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Auth\Access\AuthorizationException;
|
use Illuminate\Auth\Access\AuthorizationException;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -19,6 +20,7 @@ class EnsureScannerTenant
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
! $user
|
! $user
|
||||||
|
|| $user->rol_codigo !== RoleCode::Scanner->value
|
||||||
|| ! $user->tenant_codigo
|
|| ! $user->tenant_codigo
|
||||||
|| ! $user->hasPermission(PermissionCode::ScanTickets->value)
|
|| ! $user->hasPermission(PermissionCode::ScanTickets->value)
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->unique(['active_email', 'rol_codigo']);
|
||||||
|
$table->dropUnique(['active_email']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->unique('active_email');
|
||||||
|
$table->dropUnique(['active_email', 'rol_codigo']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::table('roles_permisos')
|
||||||
|
->where('rol_codigo', RoleCode::AdminApp->value)
|
||||||
|
->where('codigo_permiso', PermissionCode::ScanTickets->value)
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$roleExists = DB::table('roles')
|
||||||
|
->where('codigo', RoleCode::AdminApp->value)
|
||||||
|
->exists();
|
||||||
|
$permissionExists = DB::table('permisos')
|
||||||
|
->where('codigo', PermissionCode::ScanTickets->value)
|
||||||
|
->exists();
|
||||||
|
|
||||||
|
if (! $roleExists || ! $permissionExists) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('roles_permisos')->updateOrInsert(
|
||||||
|
[
|
||||||
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
|
'codigo_permiso' => PermissionCode::ScanTickets->value,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -120,7 +120,7 @@ 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' => [PermissionCode::ScanTickets->value],
|
'permisos' => [],
|
||||||
],
|
],
|
||||||
RoleCode::Scanner->value => [
|
RoleCode::Scanner->value => [
|
||||||
'nombre' => 'Scanner',
|
'nombre' => 'Scanner',
|
||||||
|
|||||||
31
docs/email-identity.md
Normal file
31
docs/email-identity.md
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# Identidad por email y rol
|
||||||
|
|
||||||
|
Cada cuenta activa se identifica por `LOWER(email)` + `rol_codigo`, globalmente,
|
||||||
|
sin incluir el tenant. Un mismo correo puede tener una cuenta `user`, otra
|
||||||
|
`adminapp`, otra `scanner` y otra `admin`. Dos cuentas activas del mismo rol
|
||||||
|
no pueden compartir correo, incluso si pertenecen a distintos tenants.
|
||||||
|
|
||||||
|
La base lo garantiza con el índice único `(active_email, rol_codigo)`.
|
||||||
|
`active_email` es una columna generada: vale `LOWER(email)` cuando `deleted_at`
|
||||||
|
es NULL y NULL para cuentas eliminadas. El soft delete libera el correo para
|
||||||
|
ese rol; registrarlo nuevamente crea una cuenta independiente.
|
||||||
|
|
||||||
|
Registro, perfil, administradores y staff validan el correo normalizado contra
|
||||||
|
el rol de destino. Cambiar de rol o restaurar una cuenta también queda sujeto
|
||||||
|
al índice único de la base.
|
||||||
|
|
||||||
|
Login y recuperación seleccionan la identidad de la aplicación:
|
||||||
|
|
||||||
|
- Tienda y Google: `user`.
|
||||||
|
- AdminApp: `adminapp`.
|
||||||
|
- Scanner: `scanner`. Sólo las identidades con ese rol pueden autenticarse y
|
||||||
|
consumir los endpoints del scanner.
|
||||||
|
- Verificación administrativa de plataforma: `admin`.
|
||||||
|
|
||||||
|
Los endpoints de validación de código y cambio de contraseña toman el rol de
|
||||||
|
la ruta, nunca del cuerpo enviado por el cliente. Los intentos y cambios de
|
||||||
|
contraseña pertenecen a una cuenta concreta, aunque otra comparta su email.
|
||||||
|
|
||||||
|
Aplicar `php artisan migrate` antes de habilitar correos compartidos por rol.
|
||||||
|
Para revertir esta migración hay que resolver primero los correos compartidos
|
||||||
|
entre cuentas activas: el índice global anterior no los admite.
|
||||||
@@ -60,6 +60,17 @@ class AdministratorControllerTest extends TestCase
|
|||||||
return ['nombre_apellido' => 'Ada Lovelace', 'dni' => '12345678', 'email' => 'ada@example.test'];
|
return ['nombre_apellido' => 'Ada Lovelace', 'dni' => '12345678', 'email' => 'ada@example.test'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_email_can_be_shared_with_customers_and_scanners(): void
|
||||||
|
{
|
||||||
|
Sanctum::actingAs($this->admin);
|
||||||
|
foreach (['user', 'scanner'] as $role) {
|
||||||
|
User::factory()->create(['email' => 'ada@example.test', 'rol_codigo' => $role]);
|
||||||
|
}
|
||||||
|
$response = $this->postJson(self::URL, $this->payload())->assertCreated();
|
||||||
|
$this->putJson(self::URL.'/'.$response->json('data.id'), $this->payload())->assertOk();
|
||||||
|
$this->postJson(self::URL, $this->payload())->assertUnprocessable()->assertJsonValidationErrors('email');
|
||||||
|
}
|
||||||
|
|
||||||
public function test_crud_and_password_setup_and_token_revocation(): void
|
public function test_crud_and_password_setup_and_token_revocation(): void
|
||||||
{
|
{
|
||||||
Sanctum::actingAs($this->admin);
|
Sanctum::actingAs($this->admin);
|
||||||
|
|||||||
133
tests/Feature/Auth/EmailUniquenessPerRoleTest.php
Normal file
133
tests/Feature/Auth/EmailUniquenessPerRoleTest.php
Normal file
@@ -0,0 +1,133 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Auth;
|
||||||
|
|
||||||
|
use App\Domains\Attachable\Enums\AttachmentType;
|
||||||
|
use App\Domains\Attachable\Models\Attachment;
|
||||||
|
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
||||||
|
use App\Domains\Auth\Models\User;
|
||||||
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
|
use App\Domains\Notification\Events\PasswordResetRequested;
|
||||||
|
use App\Domains\Tenant\Models\Tenant;
|
||||||
|
use Database\Seeders\AuthorizationSeeder;
|
||||||
|
use Illuminate\Database\UniqueConstraintViolationException;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Routing\Middleware\ThrottleRequests;
|
||||||
|
use Illuminate\Support\Facades\Event;
|
||||||
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class EmailUniquenessPerRoleTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
$this->withoutMiddleware(ThrottleRequests::class);
|
||||||
|
$this->seed(AuthorizationSeeder::class);
|
||||||
|
Event::fake([PasswordResetRequested::class]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_database_allows_different_roles_and_reuse_after_soft_delete(): void
|
||||||
|
{
|
||||||
|
foreach (RoleCode::cases() as $role) {
|
||||||
|
User::factory()->create(['email' => 'Shared@example.com', 'rol_codigo' => $role->value]);
|
||||||
|
}
|
||||||
|
$user = User::where('rol_codigo', 'user')->sole();
|
||||||
|
$user->delete();
|
||||||
|
$replacement = User::factory()->create(['email' => 'shared@example.com']);
|
||||||
|
$this->assertNotSame($user->id, $replacement->id);
|
||||||
|
$this->assertSame(4, User::where('active_email', 'shared@example.com')->count());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_database_rejects_same_role_case_insensitively_across_tenants(): void
|
||||||
|
{
|
||||||
|
foreach (['one', 'two'] as $code) {
|
||||||
|
$this->createTenant($code);
|
||||||
|
}
|
||||||
|
User::factory()->create(['email' => 'Shared@example.com', 'tenant_codigo' => 'one']);
|
||||||
|
$this->expectException(UniqueConstraintViolationException::class);
|
||||||
|
User::factory()->create(['email' => 'shared@example.com', 'tenant_codigo' => 'two']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_role_change_cannot_create_a_duplicate_active_identity(): void
|
||||||
|
{
|
||||||
|
User::factory()->create(['email' => 'shared@example.com']);
|
||||||
|
$admin = User::factory()->create(['email' => 'shared@example.com', 'rol_codigo' => 'adminapp']);
|
||||||
|
$this->expectException(UniqueConstraintViolationException::class);
|
||||||
|
$admin->update(['rol_codigo' => 'user']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_registration_accepts_another_role_but_rejects_same_role(): void
|
||||||
|
{
|
||||||
|
User::factory()->create(['email' => 'SHARED@example.com', 'rol_codigo' => 'adminapp']);
|
||||||
|
$payload = ['nombre_apellido' => 'Shared', 'email' => ' Shared@Example.com ',
|
||||||
|
'password' => 'Secret!123', 'password_confirmation' => 'Secret!123'];
|
||||||
|
$this->postJson('/api/register', $payload)->assertCreated()->assertJsonPath('data.email', 'shared@example.com');
|
||||||
|
$this->postJson('/api/register', $payload)->assertUnprocessable()->assertJsonValidationErrors('email');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_login_and_password_reset_select_the_role_from_each_application(): void
|
||||||
|
{
|
||||||
|
$tenant = $this->createTenant('acme');
|
||||||
|
$users = [];
|
||||||
|
// Create staff first so an email-only lookup would select the wrong account.
|
||||||
|
foreach (['adminapp', 'scanner', 'user'] as $role) {
|
||||||
|
$users[$role] = User::factory()->create([
|
||||||
|
'email' => 'Shared@example.com', 'rol_codigo' => $role,
|
||||||
|
'tenant_codigo' => $tenant->codigo, 'password' => 'Old!'.$role,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
foreach (['user' => '/api', 'adminapp' => '/api/v1/adminapp', 'scanner' => '/api/v1/scanner'] as $role => $base) {
|
||||||
|
$this->postJson($base.'/login', [
|
||||||
|
'email' => 'SHARED@example.com', 'password' => 'Old!'.$role, 'tenant_codigo' => 'acme',
|
||||||
|
])->assertOk()->assertJsonPath('user.id', $users[$role]->id);
|
||||||
|
$this->postJson($base.'/password/reset-attempts', [
|
||||||
|
'email' => 'shared@example.com', 'tenant_codigo' => 'acme',
|
||||||
|
])->assertAccepted();
|
||||||
|
}
|
||||||
|
// Identical codes across roles must still only change the intended account.
|
||||||
|
ResetPasswordAttempt::query()->update(['codigo' => '1234']);
|
||||||
|
foreach (['user' => '/api', 'adminapp' => '/api/v1/adminapp', 'scanner' => '/api/v1/scanner'] as $role => $base) {
|
||||||
|
$this->postJson($base.'/password/reset-attempts/validate', [
|
||||||
|
'email' => 'shared@example.com', 'codigo' => '1234',
|
||||||
|
])->assertOk();
|
||||||
|
$this->postJson($base.'/password/reset', [
|
||||||
|
'email' => 'shared@example.com', 'codigo' => '1234',
|
||||||
|
'password' => 'New!'.$role, 'password_confirmation' => 'New!'.$role,
|
||||||
|
])->assertOk();
|
||||||
|
$this->assertTrue(Hash::check('New!'.$role, $users[$role]->fresh()->password));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createTenant(string $code): Tenant
|
||||||
|
{
|
||||||
|
$headerLogo = $this->createAttachment("{$code}-header");
|
||||||
|
$footerLogo = $this->createAttachment("{$code}-footer");
|
||||||
|
|
||||||
|
return Tenant::query()->create([
|
||||||
|
'codigo' => $code,
|
||||||
|
'nombre' => ucfirst($code),
|
||||||
|
'dominio' => "{$code}.local",
|
||||||
|
'primary_color' => '#000000',
|
||||||
|
'secondary_color' => '#000000',
|
||||||
|
'danger_color' => '#000000',
|
||||||
|
'success_color' => '#000000',
|
||||||
|
'header_bg_color' => '#000000',
|
||||||
|
'footer_bg_color' => '#000000',
|
||||||
|
'header_logo_id' => $headerLogo->id,
|
||||||
|
'footer_logo_id' => $footerLogo->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createAttachment(string $name): Attachment
|
||||||
|
{
|
||||||
|
return Attachment::query()->create([
|
||||||
|
'path' => "test/{$name}.png",
|
||||||
|
'filename' => "{$name}.png",
|
||||||
|
'type' => AttachmentType::Image,
|
||||||
|
'mime_type' => 'image/png',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Tests\Feature\Auth;
|
namespace Tests\Feature\Auth;
|
||||||
|
|
||||||
|
use App\Domains\Attachable\Models\Attachment;
|
||||||
use App\Domains\Auth\Models\LoginAttempt;
|
use App\Domains\Auth\Models\LoginAttempt;
|
||||||
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
@@ -14,6 +15,7 @@ use App\Domains\Tenant\Models\Tenant;
|
|||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
|
||||||
class ScannerLoginControllerTest extends TestCase
|
class ScannerLoginControllerTest extends TestCase
|
||||||
@@ -23,19 +25,15 @@ class ScannerLoginControllerTest extends TestCase
|
|||||||
public function test_it_logs_in_a_tenant_bound_user_with_scan_permission(): 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::AdminApp->value,
|
'codigo' => RoleCode::Scanner->value,
|
||||||
'nombre' => 'Operador',
|
'nombre' => 'Scanner',
|
||||||
]);
|
]);
|
||||||
$permission = Permission::query()->create([
|
$permission = Permission::query()->create([
|
||||||
'codigo' => PermissionCode::ScanTickets->value,
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
'nombre' => 'Escanear tickets',
|
'nombre' => 'Escanear tickets',
|
||||||
]);
|
]);
|
||||||
$role->permissions()->attach($permission->codigo);
|
$role->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = $this->createTenant();
|
||||||
'codigo' => 'acme',
|
|
||||||
'nombre' => 'Acme',
|
|
||||||
'dominio' => 'acme.test',
|
|
||||||
]);
|
|
||||||
$user = User::factory()->create([
|
$user = User::factory()->create([
|
||||||
'email' => 'scanner@example.com',
|
'email' => 'scanner@example.com',
|
||||||
'password' => Hash::make('secret123'),
|
'password' => Hash::make('secret123'),
|
||||||
@@ -51,23 +49,85 @@ class ScannerLoginControllerTest extends TestCase
|
|||||||
$response
|
$response
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonPath('user.id', $user->id)
|
->assertJsonPath('user.id', $user->id)
|
||||||
->assertJsonPath('user.rol_codigo', RoleCode::AdminApp->value)
|
->assertJsonPath('user.rol_codigo', RoleCode::Scanner->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_adminapp_credentials_even_when_the_role_has_scan_permission(): void
|
||||||
|
{
|
||||||
|
$role = Role::query()->create([
|
||||||
|
'codigo' => RoleCode::AdminApp->value,
|
||||||
|
'nombre' => 'Administrador',
|
||||||
|
]);
|
||||||
|
$permission = Permission::query()->create([
|
||||||
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
|
'nombre' => 'Escanear tickets',
|
||||||
|
]);
|
||||||
|
$role->permissions()->attach($permission->codigo);
|
||||||
|
$tenant = $this->createTenant();
|
||||||
|
$adminApp = User::factory()->create([
|
||||||
|
'email' => 'shared@example.com',
|
||||||
|
'password' => Hash::make('admin-password'),
|
||||||
|
'rol_codigo' => $role->codigo,
|
||||||
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->postJson('/api/v1/scanner/login', [
|
||||||
|
'email' => $adminApp->email,
|
||||||
|
'password' => 'admin-password',
|
||||||
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
|
])->assertUnprocessable()->assertJsonValidationErrors(['email']);
|
||||||
|
|
||||||
|
$this->assertDatabaseCount('personal_access_tokens', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_shared_email_authenticates_the_scanner_identity_only(): void
|
||||||
|
{
|
||||||
|
$scannerRole = Role::query()->create([
|
||||||
|
'codigo' => RoleCode::Scanner->value,
|
||||||
|
'nombre' => 'Scanner',
|
||||||
|
]);
|
||||||
|
$adminAppRole = Role::query()->create([
|
||||||
|
'codigo' => RoleCode::AdminApp->value,
|
||||||
|
'nombre' => 'Administrador',
|
||||||
|
]);
|
||||||
|
$permission = Permission::query()->create([
|
||||||
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
|
'nombre' => 'Escanear tickets',
|
||||||
|
]);
|
||||||
|
$scannerRole->permissions()->attach($permission->codigo);
|
||||||
|
$tenant = $this->createTenant();
|
||||||
|
User::factory()->create([
|
||||||
|
'email' => 'shared@example.com',
|
||||||
|
'password' => Hash::make('admin-password'),
|
||||||
|
'rol_codigo' => $adminAppRole->codigo,
|
||||||
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
]);
|
||||||
|
$scanner = User::factory()->create([
|
||||||
|
'email' => 'shared@example.com',
|
||||||
|
'password' => Hash::make('scanner-password'),
|
||||||
|
'rol_codigo' => $scannerRole->codigo,
|
||||||
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->postJson('/api/v1/scanner/login', [
|
||||||
|
'email' => 'shared@example.com',
|
||||||
|
'password' => 'scanner-password',
|
||||||
|
])
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonPath('user.id', $scanner->id)
|
||||||
|
->assertJsonPath('user.rol_codigo', RoleCode::Scanner->value);
|
||||||
|
}
|
||||||
|
|
||||||
public function test_it_rejects_a_user_without_scan_permission(): void
|
public function test_it_rejects_a_user_without_scan_permission(): void
|
||||||
{
|
{
|
||||||
$role = Role::query()->create([
|
$role = Role::query()->create([
|
||||||
'codigo' => RoleCode::Scanner->value,
|
'codigo' => RoleCode::Scanner->value,
|
||||||
'nombre' => 'Scanner sin permiso',
|
'nombre' => 'Scanner sin permiso',
|
||||||
]);
|
]);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = $this->createTenant();
|
||||||
'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'),
|
||||||
@@ -92,11 +152,7 @@ class ScannerLoginControllerTest extends TestCase
|
|||||||
'nombre' => 'Escanear tickets',
|
'nombre' => 'Escanear tickets',
|
||||||
]);
|
]);
|
||||||
$role->permissions()->attach($permission->codigo);
|
$role->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = $this->createTenant();
|
||||||
'codigo' => 'acme',
|
|
||||||
'nombre' => 'Acme',
|
|
||||||
'dominio' => 'acme.test',
|
|
||||||
]);
|
|
||||||
$user = User::factory()->create([
|
$user = User::factory()->create([
|
||||||
'email' => 'scanner@example.com',
|
'email' => 'scanner@example.com',
|
||||||
'password' => Hash::make('correct-password'),
|
'password' => Hash::make('correct-password'),
|
||||||
@@ -134,11 +190,7 @@ class ScannerLoginControllerTest extends TestCase
|
|||||||
'nombre' => 'Escanear tickets',
|
'nombre' => 'Escanear tickets',
|
||||||
]);
|
]);
|
||||||
$role->permissions()->attach($permission->codigo);
|
$role->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = $this->createTenant();
|
||||||
'codigo' => 'acme',
|
|
||||||
'nombre' => 'Acme',
|
|
||||||
'dominio' => 'acme.test',
|
|
||||||
]);
|
|
||||||
$user = User::factory()->create([
|
$user = User::factory()->create([
|
||||||
'email' => 'scanner@example.com',
|
'email' => 'scanner@example.com',
|
||||||
'password' => Hash::make('correct-password'),
|
'password' => Hash::make('correct-password'),
|
||||||
@@ -163,4 +215,30 @@ class ScannerLoginControllerTest extends TestCase
|
|||||||
&& $event->channel === PasswordResetRequested::CHANNEL_SCANNER,
|
&& $event->channel === PasswordResetRequested::CHANNEL_SCANNER,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function createTenant(): Tenant
|
||||||
|
{
|
||||||
|
$logo = Attachment::query()->create([
|
||||||
|
'key' => (string) Str::uuid(),
|
||||||
|
'path' => 'tests/scanner-login-logo.png',
|
||||||
|
'filename' => 'scanner-login-logo.png',
|
||||||
|
'type' => 'image',
|
||||||
|
'mime_type' => 'image/png',
|
||||||
|
'extension' => 'png',
|
||||||
|
'size' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return Tenant::query()->create([
|
||||||
|
'codigo' => 'acme',
|
||||||
|
'nombre' => 'Acme',
|
||||||
|
'dominio' => 'acme.test',
|
||||||
|
'primary_color' => '#000000',
|
||||||
|
'secondary_color' => '#000000',
|
||||||
|
'danger_color' => '#000000',
|
||||||
|
'header_bg_color' => '#000000',
|
||||||
|
'footer_bg_color' => '#000000',
|
||||||
|
'header_logo_id' => $logo->id,
|
||||||
|
'footer_logo_id' => $logo->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Tests\Feature\Auth;
|
namespace Tests\Feature\Auth;
|
||||||
|
|
||||||
|
use App\Domains\Attachable\Models\Attachment;
|
||||||
use App\Domains\Auth\Models\User;
|
use App\Domains\Auth\Models\User;
|
||||||
use App\Domains\Authorization\Enums\PermissionCode;
|
use App\Domains\Authorization\Enums\PermissionCode;
|
||||||
use App\Domains\Authorization\Enums\RoleCode;
|
use App\Domains\Authorization\Enums\RoleCode;
|
||||||
@@ -10,6 +11,7 @@ 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;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Laravel\Sanctum\Sanctum;
|
use Laravel\Sanctum\Sanctum;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
|
||||||
@@ -28,11 +30,7 @@ class ScannerMeControllerTest extends TestCase
|
|||||||
'nombre' => 'Escanear tickets',
|
'nombre' => 'Escanear tickets',
|
||||||
]);
|
]);
|
||||||
$scannerRole->permissions()->attach($permission->codigo);
|
$scannerRole->permissions()->attach($permission->codigo);
|
||||||
$tenant = Tenant::query()->create([
|
$tenant = $this->createTenant();
|
||||||
'codigo' => 'acme',
|
|
||||||
'nombre' => 'Acme',
|
|
||||||
'dominio' => 'acme.test',
|
|
||||||
]);
|
|
||||||
$home = Menu::query()->create([
|
$home = Menu::query()->create([
|
||||||
'code' => 'scanner.inicio',
|
'code' => 'scanner.inicio',
|
||||||
'label' => 'Inicio',
|
'label' => 'Inicio',
|
||||||
@@ -65,4 +63,51 @@ class ScannerMeControllerTest extends TestCase
|
|||||||
->assertJsonCount(2, 'data.tenant.menues')
|
->assertJsonCount(2, 'data.tenant.menues')
|
||||||
->assertJsonMissing(['code' => $foreign->code]);
|
->assertJsonMissing(['code' => $foreign->code]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_it_rejects_an_adminapp_user_even_with_scan_permission(): void
|
||||||
|
{
|
||||||
|
$adminAppRole = Role::query()->create([
|
||||||
|
'codigo' => RoleCode::AdminApp->value,
|
||||||
|
'nombre' => 'Administrador',
|
||||||
|
]);
|
||||||
|
$permission = Permission::query()->create([
|
||||||
|
'codigo' => PermissionCode::ScanTickets->value,
|
||||||
|
'nombre' => 'Escanear tickets',
|
||||||
|
]);
|
||||||
|
$adminAppRole->permissions()->attach($permission->codigo);
|
||||||
|
$tenant = $this->createTenant();
|
||||||
|
$adminApp = User::factory()->create([
|
||||||
|
'rol_codigo' => $adminAppRole->codigo,
|
||||||
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
]);
|
||||||
|
Sanctum::actingAs($adminApp);
|
||||||
|
|
||||||
|
$this->getJson('/api/v1/scanner/me')->assertForbidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createTenant(): Tenant
|
||||||
|
{
|
||||||
|
$logo = Attachment::query()->create([
|
||||||
|
'key' => (string) Str::uuid(),
|
||||||
|
'path' => 'tests/scanner-me-logo.png',
|
||||||
|
'filename' => 'scanner-me-logo.png',
|
||||||
|
'type' => 'image',
|
||||||
|
'mime_type' => 'image/png',
|
||||||
|
'extension' => 'png',
|
||||||
|
'size' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return Tenant::query()->create([
|
||||||
|
'codigo' => 'acme',
|
||||||
|
'nombre' => 'Acme',
|
||||||
|
'dominio' => 'acme.test',
|
||||||
|
'primary_color' => '#000000',
|
||||||
|
'secondary_color' => '#000000',
|
||||||
|
'danger_color' => '#000000',
|
||||||
|
'header_bg_color' => '#000000',
|
||||||
|
'footer_bg_color' => '#000000',
|
||||||
|
'header_logo_id' => $logo->id,
|
||||||
|
'footer_logo_id' => $logo->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class AuthorizationSeederTest extends TestCase
|
|||||||
],
|
],
|
||||||
Role::query()->orderBy('codigo')->pluck('codigo')->all()
|
Role::query()->orderBy('codigo')->pluck('codigo')->all()
|
||||||
);
|
);
|
||||||
$this->assertCount(22, Permission::query()->get());
|
$this->assertCount(23, Permission::query()->get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_it_assigns_the_expected_permissions_to_each_role(): void
|
public function test_it_assigns_the_expected_permissions_to_each_role(): void
|
||||||
@@ -39,7 +39,7 @@ class AuthorizationSeederTest extends TestCase
|
|||||||
$scanner = Role::query()->where('codigo', RoleCode::Scanner->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(23, $admin->permissions);
|
||||||
$this->assertCount(0, $appAdmin->permissions);
|
$this->assertCount(0, $appAdmin->permissions);
|
||||||
$this->assertSame(
|
$this->assertSame(
|
||||||
[PermissionCode::ScanTickets->value],
|
[PermissionCode::ScanTickets->value],
|
||||||
@@ -54,7 +54,7 @@ class AuthorizationSeederTest extends TestCase
|
|||||||
$this->seed(AuthorizationSeeder::class);
|
$this->seed(AuthorizationSeeder::class);
|
||||||
|
|
||||||
$this->assertCount(4, Role::query()->get());
|
$this->assertCount(4, Role::query()->get());
|
||||||
$this->assertCount(22, Permission::query()->get());
|
$this->assertCount(23, Permission::query()->get());
|
||||||
$this->assertDatabaseCount('roles_permisos', 23);
|
$this->assertDatabaseCount('roles_permisos', 24);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,17 @@ class StaffControllerTest extends TestCase
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_staff_email_can_be_shared_with_adminapp_and_customers(): void
|
||||||
|
{
|
||||||
|
Sanctum::actingAs($this->admin);
|
||||||
|
User::factory()->create(['email' => $this->admin->email]);
|
||||||
|
$payload = ['nombre_apellido' => 'Shared', 'dni' => '12345678',
|
||||||
|
'email' => strtoupper($this->admin->email), 'category_ids' => [$this->createCategory('Tickets')->id]];
|
||||||
|
$response = $this->postJson('/api/v1/adminapp/tenant/staff', $payload)->assertSuccessful();
|
||||||
|
$this->putJson('/api/v1/adminapp/tenant/staff/'.$response->json('data.id'), $payload)->assertOk();
|
||||||
|
$this->postJson('/api/v1/adminapp/tenant/staff', $payload)->assertUnprocessable()->assertJsonValidationErrors('email');
|
||||||
|
}
|
||||||
|
|
||||||
public function test_adminapp_can_create_update_list_and_delete_staff_with_categories(): void
|
public function test_adminapp_can_create_update_list_and_delete_staff_with_categories(): void
|
||||||
{
|
{
|
||||||
Sanctum::actingAs($this->admin);
|
Sanctum::actingAs($this->admin);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace Tests\Feature\Ticket;
|
|||||||
|
|
||||||
use App\Domains\Attachable\Models\Attachment;
|
use App\Domains\Attachable\Models\Attachment;
|
||||||
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\Catalog\Models\CatalogItem;
|
use App\Domains\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Catalog\Models\Category;
|
use App\Domains\Catalog\Models\Category;
|
||||||
@@ -300,42 +301,19 @@ class ScannerTicketControllerTest extends TestCase
|
|||||||
->assertNotFound();
|
->assertNotFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_adminapp_can_read_and_scan_all_tenant_categories_without_assignments(): void
|
public function test_adminapp_cannot_access_scanner_routes_even_with_scan_permission(): void
|
||||||
{
|
{
|
||||||
$this->tenant->update(['scanner_category_validation_enabled' => true]);
|
|
||||||
$admin = User::factory()->create([
|
$admin = User::factory()->create([
|
||||||
'rol_codigo' => RoleCode::AdminApp->value,
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
'tenant_codigo' => $this->tenant->codigo,
|
'tenant_codigo' => $this->tenant->codigo,
|
||||||
]);
|
]);
|
||||||
$this->assertCount(0, $admin->scanCategories);
|
$admin->role()->firstOrFail()->permissions()->attach(PermissionCode::ScanTickets->value);
|
||||||
$otherCategory = Category::query()->create([
|
$ticket = $this->createTicket((string) Str::uuid());
|
||||||
'tenant_code' => $this->tenant->codigo, 'nombre' => 'Comidas',
|
|
||||||
]);
|
|
||||||
Sanctum::actingAs($admin);
|
Sanctum::actingAs($admin);
|
||||||
foreach ([$this->category, $otherCategory] as $category) {
|
|
||||||
$ticket = $this->createTicket((string) Str::uuid(), [], $category);
|
|
||||||
$this->getJson("/api/v1/scanner/tickets/{$ticket->ticket}")->assertOk();
|
|
||||||
$this->postJson("/api/v1/scanner/tickets/{$ticket->ticket}/scan")
|
|
||||||
->assertOk()->assertJsonPath('data.scanner_user_id', $admin->id);
|
|
||||||
$this->postJson("/api/v1/scanner/tickets/{$ticket->ticket}/scan")
|
|
||||||
->assertUnprocessable()->assertJsonValidationErrors('ticket');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function test_adminapp_cannot_read_or_scan_another_tenants_ticket(): void
|
$this->getJson('/api/v1/scanner/tickets')->assertForbidden();
|
||||||
{
|
$this->getJson("/api/v1/scanner/tickets/{$ticket->ticket}")->assertForbidden();
|
||||||
$admin = User::factory()->create([
|
$this->postJson("/api/v1/scanner/tickets/{$ticket->ticket}/scan")->assertForbidden();
|
||||||
'rol_codigo' => RoleCode::AdminApp->value,
|
|
||||||
'tenant_codigo' => $this->tenant->codigo,
|
|
||||||
]);
|
|
||||||
$foreignTenant = $this->createTenant('foreign');
|
|
||||||
$foreignCategory = Category::query()->create([
|
|
||||||
'tenant_code' => $foreignTenant->codigo, 'nombre' => 'Externas',
|
|
||||||
]);
|
|
||||||
$ticket = $this->createTicket((string) Str::uuid(), [], $foreignCategory, $foreignTenant);
|
|
||||||
Sanctum::actingAs($admin);
|
|
||||||
$this->getJson("/api/v1/scanner/tickets/{$ticket->ticket}")->assertNotFound();
|
|
||||||
$this->postJson("/api/v1/scanner/tickets/{$ticket->ticket}/scan")->assertNotFound();
|
|
||||||
$this->assertNull($ticket->fresh()->used_at);
|
$this->assertNull($ticket->fresh()->used_at);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user