Multiples corrections

This commit is contained in:
2026-05-14 18:52:40 +02:00
parent 5b2a2e7ddb
commit 85ad36880c
20 changed files with 7065 additions and 964 deletions
@@ -31,6 +31,14 @@ class AuthController extends Controller
], 401);
}
// Vérification si le compte est actif
if (!$user->is_active) {
return response([
'status' => 'error',
'message' => 'Votre compte a été désactivé par un administrateur.'
], 403);
}
// Log::info('Email reçu: ' . $request->email);
// Log::info('Password saisi: ' . $request->password);
// Log::info('Hachage en BDD: ' . $user->password);
@@ -45,7 +53,7 @@ class AuthController extends Controller
], 200);
}
public function register(Request $request)
public function register(Request $request)
{
// 1. Validation des données (Standard Qualité)
$validator = Validator::make($request->all(), [
@@ -54,7 +62,7 @@ class AuthController extends Controller
'password' => 'required|string|min:8|confirmed',
]);
Log::info('Tentative de création', $request->all());
if ($validator->fails()) {
@@ -90,8 +98,8 @@ class AuthController extends Controller
$request->validate([
'current_password' => 'required',
'email' => [
'sometimes',
'email',
'sometimes',
'email',
Rule::unique('users')->ignore($user->id) // Empêche les doublons en BDD
],
]);
@@ -99,7 +107,7 @@ class AuthController extends Controller
// 2. Vérification de sécurité (RGPD/Confidentialité)
if (!Hash::check($request->current_password, $user->password)) {
return response()->json([
'status' => 'error',
'status' => 'error',
'message' => 'Le mot de passe actuel est incorrect'
], 403);
}
@@ -114,4 +122,4 @@ class AuthController extends Controller
'user' => $user
]);
}
}
}
@@ -30,20 +30,16 @@ class DiagnosticController extends Controller
return view('diagnostics.history', compact('history'));
}
public function store(Request $request)
public function store(Request $request, \App\Services\StressCalculator $calculator)
{
// Logique pour calculer le score Holmes-Rahe
$totalPoints = 0;
if ($request->has('events')) {
$totalPoints = StressEvent::whereIn('id', $request->events)->sum('points');
$points = StressEvent::whereIn('id', $request->events)->pluck('points')->toArray();
$totalPoints = $calculator->calculateScore($points);
}
$niveauStress = 'Faible';
if ($totalPoints >= 300) {
$niveauStress = 'Élevé';
} elseif ($totalPoints >= 150) {
$niveauStress = 'Modéré';
}
$niveauStress = $calculator->determineLevel($totalPoints);
// Enregistrement si l'utilisateur est connecté
if (Auth::check()) {
+7 -1
View File
@@ -2,9 +2,15 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class StressEvent extends Model
{
//
use HasFactory;
protected $fillable = [
'event_name',
'points',
];
}
+22 -23
View File
@@ -2,61 +2,60 @@
namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Database\Factories\UserFactory;
use Filament\Models\Contracts\FilamentUser;
use Filament\Panel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;
class User extends Authenticatable
class User extends Authenticatable implements FilamentUser
{
/** @use HasFactory<UserFactory> */
use HasFactory, Notifiable;
use HasApiTokens, HasFactory, Notifiable;
/**
* The attributes that are mass assignable.
*
* @var list<string>
*/
protected $fillable = [
'name',
'email',
'password',
'id_role',
'is_active',
];
/**
* The attributes that should be hidden for serialization.
*
* @var list<string>
*/
protected $hidden = [
'password',
'remember_token',
];
/**
* Get the attributes that should be cast.
*
* @return array<string, string>
*/
protected function casts(): array
{
return [
'email_verified_at' => 'datetime',
'password' => 'hashed',
'is_active' => 'boolean',
];
}
public function emotionRecords()
public function role(): BelongsTo
{
return $this->hasMany(EmotionRecord::class);
return $this->belongsTo(Role::class, 'id_role');
}
public function favoritedBy()
public function emotionRecords(): HasMany
{
return $this->hasMany(EmotionRecord::class, 'user_id');
}
public function favoritedActivities(): BelongsToMany
{
return $this->belongsToMany(RelaxationActivity::class, 'favorites', 'id_user', 'id_activite');
}
public function canAccessPanel(Panel $panel): bool
{
// Autorise l'accès si l'utilisateur est actif et a le rôle 'Admin'
return $this->is_active && $this->role && $this->role->libelle === 'Admin';
}
}
+3 -1
View File
@@ -19,6 +19,8 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot(): void
{
//
if (config('app.env') === 'production' || config('app.env') === 'local') {
\Illuminate\Support\Facades\URL::forceScheme('https');
}
}
}