Administrator password hashing method moved from command to model

toonvandenbos · May 12, 2015 · e5a292e · e5a292e
1 parent be1fca6
commit e5a292e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/SleepingOwl/Admin/Commands/AdministratorsCommand.php b/src/SleepingOwl/Admin/Commands/AdministratorsCommand.php
@@ -1,7 +1,6 @@
 <?php namespace SleepingOwl\Admin\Commands;
 
 use Config;
-use Hash;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 use SleepingOwl\Admin\Commands\Compilers\ModelCompiler;
@@ -98,7 +97,7 @@ protected function createNewAdministrator()
 		{
 			Administrator::create([
 				'username' => $username,
-				'password' => Hash::make($password),
+				'password' => $password,
 				'name'     => $name,
 			]);
 		} catch (\Exception $e)
@@ -156,7 +155,7 @@ protected function changePassword()
 			return;
 		}
 
-		Administrator::find($id)->fill(['password' => Hash::make($password)])->save();
+		Administrator::find($id)->fill(['password' => $password])->save();
 
 		$this->info('Password was changed.');
 	}

diff --git a/src/SleepingOwl/AdminAuth/Entities/Administrator.php b/src/SleepingOwl/AdminAuth/Entities/Administrator.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Hash;
 
 class Administrator extends \Eloquent implements AuthenticatableContract
 {
@@ -18,4 +19,12 @@ class Administrator extends \Eloquent implements AuthenticatableContract
 		'remember_token',
 	];
 
+	public function setPasswordAttribute($value)
+	{
+		if ( ! empty($value))
+		{
+			$this->attributes['password'] = Hash::make($value);
+		}
+	}
+
 }