Fix reset confirmation mail from occ stable10

core/Command/User/ResetPassword.php

@@ -175,6 +175,20 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			return 1;
 		}
 
+		if ($emailLink) {
+			$userId = $user->getUID();
+			list(, $token) = $this->lostController->generateTokenAndLink($userId);
+			$this->config->setUserValue($userId, 'owncloud', 'lostpassword', $this->timeFactory->getTime() . ':' . $token);
+			$success = $this->lostController->setPassword($token, $userId, $password, false);
+			if (\is_array($success) && isset($success['status']) && $success['status'] === 'success') {
+				$output->writeln("<info>Successfully reset password for {$username}.</info>");
+				return 0;
+			} else {
+				$output->writeln("<error>Error while resetting password!</error>");
+				return 1;
+			}
+		}
+
 		$success = $user->setPassword($password);
 		if ($success) {
 			$output->writeln("<info>Successfully reset password for " . $username . "</info>");

tests/Core/Command/User/ResetPasswordTest.php

@@ -240,4 +240,75 @@ public function testEmailLinkFailure($emailAddress) {
 			->with('<error>Email address is not set for the user foo</error>');
 		$this->invokePrivate($this->resetPassword, 'execute', [$input, $output]);
 	}
+
+	public function providesStatusOfPasswordFromEnvWithEmailConfirmation() {
+		return [
+			[true],
+			[false]
+		];
+	}
+
+	/**
+	 * @dataProvider providesStatusOfPasswordFromEnvWithEmailConfirmation
+	 * @param $expectedResult
+	 */
+	public function testPasswordFromEnvAndPasswordConfirmationEmail($expectedResult) {
+		$input = $this->createMock(InputInterface::class);
+		$output = $this->createMock(OutputInterface::class);
+
+		$input->expects($this->once())
+			->method('getArgument')
+			->willReturn('foo');
+
+		$input->expects($this->exactly(3))
+			->method('getOption')
+			->willReturnMap([
+				['send-email', true],
+				['output-link', false],
+				['password-from-env', true]
+			]);
+
+		$user = $this->createMock(IUser::class);
+
+		$user->method('getUID')
+			->willReturn('foo');
+
+		$this->userManager->expects($this->once())
+			->method('get')
+			->willReturn($user);
+
+		$this->environmentHelper->expects($this->once())
+			->method('getEnvVar')
+			->willReturn('fooPass');
+
+		$this->lostController->expects($this->once())
+			->method('generateTokenAndLink')
+			->with('foo')
+			->willReturn(['http://localhost/foo/bar/123AbcFooBar/foo', '123AbcFooBar']);
+
+		if ($expectedResult === true) {
+			$this->lostController->expects($this->once())
+				->method('setPassword')
+				->willReturn(['status' => 'success']);
+
+			$output->expects($this->once())
+				->method('writeln')
+				->with("<info>Successfully reset password for foo.</info>");
+		} else {
+			$this->lostController->expects($this->once())
+				->method('setPassword')
+				->willReturn("failed");
+
+			$output->expects($this->once())
+				->method('writeln')
+				->with("<error>Error while resetting password!</error>");
+		}
+
+		$result = $this->invokePrivate($this->resetPassword, 'execute', [$input, $output]);
+		if ($expectedResult === true) {
+			$this->assertEquals(0, $result);
+		} else {
+			$this->assertEquals(1, $result);
+		}
+	}
 }

tests/acceptance/features/cliProvisioning/resetUserPassword.feature

@@ -26,19 +26,17 @@ Feature: reset user password
       Use the following link to reset your password: <a href=
       """
 
-  @issue-33384
   Scenario: user should get email when the administrator changes their password and specifies to also send email
     Given these users have been created:
       | username       | password  | displayname | email                    |
       | brand-new-user | %regular% | New user    | brand.new.user@oc.com.np |
     When the administrator resets the password of user "brand-new-user" to "%alt1%" sending email using the occ command
     Then the command should have been successful
     And the command output should contain the text "Successfully reset password for brand-new-user"
-    And the email address "brand.new.user@oc.com.np" should not have received an email
-    #And the email address "brand.new.user@oc.com.np" should have received an email with the body containing
-      #"""
-      #Password changed successfully
-      #"""
+    And the email address "brand.new.user@oc.com.np" should have received an email with the body containing
+      """
+      Password changed successfully
+      """
     And the content of file "textfile0.txt" for user "brand-new-user" using password "%alt1%" should be "ownCloud test text file 0" plus end-of-line
     But user "brand-new-user" using password "%regular%" should not be able to download file "textfile0.txt"