eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-21 23:16:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Clean code and use const

Browse source 
Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
This commit is contained in:
Jean-Yves 2024-09-24 20:12:16 +02:00
parent d674ba4f6e
commit 56aa613dfb
No known key found for this signature in database
GPG key ID: 644C8B9C4CABAEF7
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
php/src/Auth/AuthManager.php
View file

@ -4,25 +4,25 @@ namespace AIO\Auth;
use AIO\Data\ConfigurationManager; use AIO\Data\ConfigurationManager;
use AIO\Data\DataConst; use AIO\Data\DataConst;
use \DateTime; use DateTime;
class AuthManager { class AuthManager {
private const string SESSION_KEY = 'aio_authenticated'; private const string SESSION_KEY = 'aio_authenticated';
private ConfigurationManager $configurationManager;
public function __construct(ConfigurationManager $configurationManager) { public function __construct(
$this->configurationManager = $configurationManager; private readonly ConfigurationManager $configurationManager
) {
} }
public function CheckCredentials(string $password) : bool { public function CheckCredentials(string $password): bool {
return hash_equals($this->configurationManager->GetPassword(), $password); return hash_equals($this->configurationManager->GetPassword(), $password);
} }
public function CheckToken(string $token) : bool { public function CheckToken(string $token): bool {
return hash_equals($this->configurationManager->GetToken(), $token); return hash_equals($this->configurationManager->GetToken(), $token);
} }
public function SetAuthState(bool $isLoggedIn) : void { public function SetAuthState(bool $isLoggedIn): void {
if (!$this->IsAuthenticated() && $isLoggedIn === true) { if (!$this->IsAuthenticated() && $isLoggedIn === true) {
$date = new DateTime(); $date = new DateTime();
@ -40,7 +40,7 @@ class AuthManager {
$_SESSION[self::SESSION_KEY] = $isLoggedIn; $_SESSION[self::SESSION_KEY] = $isLoggedIn;
} }
public function IsAuthenticated() : bool { public function IsAuthenticated(): bool {
return isset($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY] === true; return isset($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY] === true;
} }
} }

20
php/src/Auth/PasswordGenerator.php
View file

@ -2,11 +2,11 @@
namespace AIO\Auth; namespace AIO\Auth;
use AIO\Data\ConfigurationManager; use Random\RandomException;
class PasswordGenerator class PasswordGenerator {
{
private array $words = [ private const array WORDS = [
'abacus', 'abacus',
'abdomen', 'abdomen',
'abdominal', 'abdominal',
@ -7785,14 +7785,18 @@ class PasswordGenerator
'zoom', 'zoom',
]; ];
public function GeneratePassword(int $length) : string {
/**
* @throws RandomException
*/
public function GeneratePassword(int $length): string {
$password = ''; $password = '';
for($i = 0; $i < $length; $i ++) { for ($i = 0; $i < $length; $i++) {
if($password !== '') { if ($password !== '') {
$password = $password . ' '; $password = $password . ' ';
} }
$password = $password . $this->words[random_int(0, 7775)]; $password = $password . PasswordGenerator::WORDS[random_int(0, 7775)];
} }
return $password; return $password;