From f65a7b3130c207939d3a64d77543d5517e8a2a5a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 18 Apr 2018 22:56:52 -0400
Subject: [PATCH] Add hidden password input to Console\NewPassword

- Add Exception when password is empty
---
 src/Core/Console/NewPassword.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index d44286d28f..f5698ba716 100644
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -27,7 +27,7 @@ class NewPassword extends \Asika\SimpleConsole\Console
 		$help = <<<HELP
 console newpassword - Creates a new password for a given user
 Usage
-	bin/console newpassword <nickname> <password> [-h|--help|-?] [-v]
+	bin/console newpassword <nickname> [<password>] [-h|--help|-?] [-v]
 
 Description
 	Creates a new password for a user without using the "forgot password" functionality.
@@ -67,13 +67,22 @@ HELP;
 		}
 
 		$nick = $this->getArgument(0);
-		$password = $this->getArgument(1);
 
 		$user = dba::selectFirst('user', ['uid'], ['nickname' => $nick]);
 		if (!DBM::is_result($user)) {
 			throw new \RuntimeException(L10n::t('User not found'));
 		}
 
+		$password = $this->getArgument(1);
+		if (is_null($password)) {
+			$this->out(L10n::t('Enter new password: '), false);
+			$password = \Seld\CliPrompt\CliPrompt::hiddenPrompt(true);
+		}
+
+		if (!$password) {
+			throw new \RuntimeException(L10n::t('Password can\'t be empty'));
+		}
+
 		if (!Config::get('system', 'disable_password_exposed', false) && User::isPasswordExposed($password)) {
 			throw new \RuntimeException(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
 		}