diff --git a/app/Auth/CustomUserProvider.php b/app/Auth/CustomUserProvider.php index 9637e0c..79a75cd 100644 --- a/app/Auth/CustomUserProvider.php +++ b/app/Auth/CustomUserProvider.php @@ -16,15 +16,15 @@ class CustomUserProvider extends EloquentUserProvider if ($this->isBcryptHash($hashed)) { // Use the hasher to verify the password if ($this->hasher->check($plain, $hashed)) { - return true; + return true; } } else { // Fallback for legacy MD5 hashes if (md5($plain) === $hashed) { - // Upgrade the password to bcrypt - $user->password = $this->hasher->make($plain); - $user->save(); - return true; + // Upgrade the password to bcrypt + $user->password = $this->hasher->make($plain); + $user->save(); + return true; } } diff --git a/app/Auth/PassportUserRepository.php b/app/Auth/PassportUserRepository.php index 5fe5bd8..1c3fded 100644 --- a/app/Auth/PassportUserRepository.php +++ b/app/Auth/PassportUserRepository.php @@ -25,16 +25,16 @@ class PassportUserRepository extends UserRepository // Avoid Hash::check() error with non-bcrypt hashes if ($this->isBcryptHash($user->password)) { if (Hash::check($password, $user->password)) { - return new User($user->id); + return new User($user->id); } } else { // If the hash is not bcrypt, check for MD5 manually if (md5($password) === $user->password) { - // Upgrade password to bcrypt - $user->password = Hash::make($password); - $user->save(); + // Upgrade password to bcrypt + $user->password = Hash::make($password); + $user->save(); - return new User($user->id); + return new User($user->id); } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index c91f8d3..8f13c4b 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -29,8 +29,8 @@ class AuthServiceProvider extends ServiceProvider // Use custom Passport user repository for API login $this->app->afterResolving(AuthorizationServer::class, function ($server) { $grant = new \League\OAuth2\Server\Grant\PasswordGrant( - app(PassportUserRepository::class), // Custom Passport user repository - app(RefreshTokenRepository::class) + app(PassportUserRepository::class), // Custom Passport user repository + app(RefreshTokenRepository::class) ); $grant->setRefreshTokenTTL(new DateInterval('P1M')); // 1 month refresh token