Compare commits

..

No commits in common. "master" and "v4.6.0" have entirely different histories.

5 changed files with 15 additions and 7 deletions

View File

@ -15,5 +15,5 @@ if ($adminUserRow == null)
} }
$adminUserRow->update([ $adminUserRow->update([
'password' => password_hash('admin', PASSWORD_ARGON2ID) 'password' => password_hash('admin', PASSWORD_DEFAULT)
]); ]);

8
.editorconfig Normal file
View File

@ -0,0 +1,8 @@
root = true
[*]
indent_style = tab
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

View File

@ -40,10 +40,10 @@ class DefaultAuthMiddleware extends AuthMiddleware
$sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently); $sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently);
self::SetSessionCookie($sessionKey); self::SetSessionCookie($sessionKey);
if (password_needs_rehash($user->password, PASSWORD_ARGON2ID)) if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
{ {
$user->update([ $user->update([
'password' => password_hash($inputPassword, PASSWORD_ARGON2ID) 'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
]); ]);
} }

View File

@ -9,7 +9,7 @@ if (defined('GROCY_HTTP_USER'))
// Migrate old user defined in config file to database // Migrate old user defined in config file to database
$newUserRow = $db->users()->createRow([ $newUserRow = $db->users()->createRow([
'username' => GROCY_HTTP_USER, 'username' => GROCY_HTTP_USER,
'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_ARGON2ID) 'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT)
]); ]);
$newUserRow->save(); $newUserRow->save();
} }
@ -18,7 +18,7 @@ else
// Create default user "admin" with password "admin" // Create default user "admin" with password "admin"
$newUserRow = $db->users()->createRow([ $newUserRow = $db->users()->createRow([
'username' => 'admin', 'username' => 'admin',
'password' => password_hash('admin', PASSWORD_ARGON2ID) 'password' => password_hash('admin', PASSWORD_DEFAULT)
]); ]);
$newUserRow->save(); $newUserRow->save();
} }

View File

@ -12,7 +12,7 @@ class UsersService extends BaseService
'username' => $username, 'username' => $username,
'first_name' => $firstName, 'first_name' => $firstName,
'last_name' => $lastName, 'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_ARGON2ID), 'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName 'picture_file_name' => $pictureFileName
]); ]);
$newUserRow = $newUserRow->save(); $newUserRow = $newUserRow->save();
@ -61,7 +61,7 @@ class UsersService extends BaseService
'username' => $username, 'username' => $username,
'first_name' => $firstName, 'first_name' => $firstName,
'last_name' => $lastName, 'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_ARGON2ID), 'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName 'picture_file_name' => $pictureFileName
]); ]);
} }