[user:*] Updates for user commands (#3667)

* user-pass: Added updates for upr command. * user-command: Updates for user commands. * user-command: Added updates for user commands. * [user:*]: Fix code styles.
hechoendrupal · Jan 10, 2018 · 1e8be8b · 1e8be8b
1 parent 78b6fd8
commit 1e8be8b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/src/Command/User/LoginUrlCommand.php b/src/Command/User/LoginUrlCommand.php
@@ -54,14 +54,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
 
-        $user = $input->getArgument('user');
-        if (!$user) {
-            $user = $io->ask(
-                $this->trans('commands.user.login.url.questions.user')
-            );
-
-            $input->setArgument('user', $user);
-        }
+			  $this->userQuestion();
     }
 
     /**

diff --git a/src/Command/User/PasswordResetCommand.php b/src/Command/User/PasswordResetCommand.php
@@ -72,14 +72,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
 
-        $user = $input->getArgument('user');
-        if (!$user) {
-            $user = $io->ask(
-                $this->trans('commands.user.password.reset.questions.user')
-            );
-
-            $input->setArgument('user', $user);
-        }
+        $this->userQuestion();
 
         $password = $input->getArgument('password');
         if (!$password) {

diff --git a/src/Command/User/UserBase.php b/src/Command/User/UserBase.php
@@ -17,6 +17,7 @@ class UserBase extends Command
      */
     protected $entityTypeManager;
 
+
     /**
      * Base constructor.
      *
@@ -50,4 +51,37 @@ public function getUserEntity($user)
 
         return $userEntity;
     }
+
+    /***
+     * @return array users from site
+     */
+    public function getUsers()
+    {
+        $userStorage =  $this->entityTypeManager->getStorage('user');
+        $users = $userStorage->loadMultiple();
+
+        $userList = [];
+        foreach ($users as $userId => $user) {
+            $userList[$userId] = $user->getUsername();
+        }
+
+        return $userList;
+    }
+
+    public function userQuestion()
+    {
+        $input = $this->getIo()->getInput();
+        $user = $input->getArgument('user');
+
+        if (!$user) {
+            $user = $this->getIo()->choiceNoList(
+                $this->trans('commands.user.password.reset.questions.user'),
+                $this->getUsers()
+            );
+
+            $input->setArgument('user', $user);
+        }
+
+        return $user;
+    }
 }