mirror of
https://github.com/grocy/grocy.git
synced 2026-03-28 15:49:25 +01:00
Compare commits
No commits in common. "master" and "v4.6.0" have entirely different histories.
|
|
@ -15,5 +15,5 @@ if ($adminUserRow == null)
|
|||
}
|
||||
|
||||
$adminUserRow->update([
|
||||
'password' => password_hash('admin', PASSWORD_ARGON2ID)
|
||||
'password' => password_hash('admin', PASSWORD_DEFAULT)
|
||||
]);
|
||||
|
|
|
|||
8
.editorconfig
Normal file
8
.editorconfig
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
|
@ -40,10 +40,10 @@ class DefaultAuthMiddleware extends AuthMiddleware
|
|||
$sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently);
|
||||
self::SetSessionCookie($sessionKey);
|
||||
|
||||
if (password_needs_rehash($user->password, PASSWORD_ARGON2ID))
|
||||
if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
|
||||
{
|
||||
$user->update([
|
||||
'password' => password_hash($inputPassword, PASSWORD_ARGON2ID)
|
||||
'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ if (defined('GROCY_HTTP_USER'))
|
|||
// Migrate old user defined in config file to database
|
||||
$newUserRow = $db->users()->createRow([
|
||||
'username' => GROCY_HTTP_USER,
|
||||
'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_ARGON2ID)
|
||||
'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT)
|
||||
]);
|
||||
$newUserRow->save();
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ else
|
|||
// Create default user "admin" with password "admin"
|
||||
$newUserRow = $db->users()->createRow([
|
||||
'username' => 'admin',
|
||||
'password' => password_hash('admin', PASSWORD_ARGON2ID)
|
||||
'password' => password_hash('admin', PASSWORD_DEFAULT)
|
||||
]);
|
||||
$newUserRow->save();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class UsersService extends BaseService
|
|||
'username' => $username,
|
||||
'first_name' => $firstName,
|
||||
'last_name' => $lastName,
|
||||
'password' => password_hash($password, PASSWORD_ARGON2ID),
|
||||
'password' => password_hash($password, PASSWORD_DEFAULT),
|
||||
'picture_file_name' => $pictureFileName
|
||||
]);
|
||||
$newUserRow = $newUserRow->save();
|
||||
|
|
@ -61,7 +61,7 @@ class UsersService extends BaseService
|
|||
'username' => $username,
|
||||
'first_name' => $firstName,
|
||||
'last_name' => $lastName,
|
||||
'password' => password_hash($password, PASSWORD_ARGON2ID),
|
||||
'password' => password_hash($password, PASSWORD_DEFAULT),
|
||||
'picture_file_name' => $pictureFileName
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user