Some fixes for hashing

2 files changed, 5 insertions, 4 deletions

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index a051071..14f1ef3 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -64,8 +64,8 @@ class RegisterController extends Controller
     protected function create(array $data)
     {
         $hashedPassword = Hash::make($data['password']);
-        $previousHash = User::select('hash')->orderBy('id','desc')->first();
-        $summedHash = bcrypt($previousHash . $data['name'] . $data['email'] . 'password' . $hashedPassword);
+        $previousHash = User::select('hash')->orderBy('id','desc')->first()->hash;
+        $summedHash = Hash::make($previousHash . $data['name'] . $data['email'] . 'password' . $hashedPassword); // Hash::check to verify
 
         return User::create([
             'name' => $data['name'],
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index db0f2fd..b31b7e0 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 
 class DatabaseSeeder extends Seeder
 {
@@ -23,8 +24,8 @@ class DatabaseSeeder extends Seeder
         DB::table('users')->insert([
             'name' => 'Marvin Borner',
             'email' => 'marvin@borners.de',
-            'password' => bcrypt('password'),
-            'hash' => bcrypt(bcrypt('genesis') . 'Marvin Borner'. 'marvin@borners.de'. 'password') // hashing: prev hash, all fields in current 'block'
+            'password' => Hash::make('password'),
+            'hash' => Hash::make(Hash::make('genesis') . 'Marvin Borner' . 'marvin@borners.de' . Hash::make('password')) // hashing: prev hash, all fields in current 'block'
         ]);
     }
 }