From ba9d0893b7dd85098999b8d3f7e72c4fc27a0bd3 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 13 Nov 2022 22:51:51 +0100 Subject: [PATCH] Fix auth login error --- composer.json | 2 +- docker-compose.dev.yml | 2 +- fuel/app/classes/controller/rest/install.php | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 830fcc0..02c2ddd 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": ["application", "website", "development", "framework", "PHP", "PHP7"], "license": "MIT", "require": { - "php": ">=5.6.33", + "php": "7.4.*", "composer/installers": "~1.0", "fuel/core": "1.8.*", "fuel/auth": "1.8.*", diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b61110e..d65333b 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -34,4 +34,4 @@ services: # COMPOSER COMPOSER_VERSION: 1 volumes: - - .:/app + - .:/app \ No newline at end of file diff --git a/fuel/app/classes/controller/rest/install.php b/fuel/app/classes/controller/rest/install.php index c16f612..fee072e 100755 --- a/fuel/app/classes/controller/rest/install.php +++ b/fuel/app/classes/controller/rest/install.php @@ -7,6 +7,7 @@ use Fuel\Core\FuelException; use Fuel\Core\Input; use Fuel\Core\Migrate; use Fuel\Core\Request; +use Fuel\Core\Response; use Fuel\Core\Str; class Controller_Rest_Install extends Controller_Rest @@ -115,7 +116,7 @@ class Controller_Rest_Install extends Controller_Rest public function post_admin() { try { - $config = Config::load('db', true); + $configCrypt = Config::load('crypt', true); $email = Input::post('email'); $username = Input::post('username'); @@ -128,7 +129,7 @@ class Controller_Rest_Install extends Controller_Rest $user = Model_User::forge(array( 'username' => $username, 'email' => $email, - 'password' => hash('sha512', $config['default']['hash'] . $password), + 'password' => hash('sha512', $configCrypt['sodium']['cipherkey'] . $password), 'admin' => 1, 'lastlogin' => time() ));