Merge pull request #449 from syphernl/fix/import_password

Fixes #448: Only generate a random password if we don't have one set

Author: stevebauman

src/Auth/DatabaseUserProvider.php

@@ -138,17 +138,24 @@ public function validateCredentials(Authenticatable $model, array $credentials)
                     // We'll check if we've been given a password and that
                     // syncing password is enabled. Otherwise we'll
                     // use a random 16 character string.
+
+                    $password = null;
                     if ($this->isSyncingPasswords()) {
                         $password = $credentials['password'];
                     } else {
-                        $password = str_random();
+                        if(null === $model->password || empty($model->password)) {
+                            // password unset
+                            $password = str_random();
+                        }
                     }
 
                     // If the model has a set mutator for the password then we'll
                     // assume that we're using a custom encryption method for
                     // passwords. Otherwise we'll bcrypt it normally.
-                    $model->password = $model->hasSetMutator('password') ?
-                        $password : bcrypt($password);
+                    if(null !== $password) {
+                        $model->password = $model->hasSetMutator('password') ?
+                            $password : bcrypt($password);
+                    }
 
                     // All of our validation rules have passed and we can
                     // finally save the model in case of changes.

src/Commands/Import.php

@@ -112,11 +112,14 @@ public function import(array $users = [])
                 // Import the user and retrieve it's model.
                 $model = $this->getImporter()->run($user, $this->model(), $credentials);
 
-                $password = str_random();
+                // Only set a new password if we are creating a new user
+                if (!isset($model->password) || empty($model->password)) {
+                    $password = str_random();
 
-                // Set the models password.
-                $model->password = $model->hasSetMutator('password') ?
-                    $password : bcrypt($password);
+                    // Set the models password.
+                    $model->password = $model->hasSetMutator('password') ?
+                        $password : bcrypt($password);
+                }
 
                 // Save the returned model.
                 $this->save($user, $model);