Verified Commit 46e33eda authored by quietone's avatar quietone
Browse files

Issue #2969406 by bhanu951, robincs, quietone, ranjit1032002, sahil.goyal,... 

Issue #2969406 by bhanu951, robincs, quietone, ranjit1032002, sahil.goyal, urvashi_vora, opdavies, elber, aaronmchale, avpaderno, smustgrave, alberto56, cilefen, benjifisher, lauriii, larowlan, Mahima_Mathur23, nkoporec, borisson_, poker10: Fix incorrect message after resetting password

(cherry picked from commit 5874bcd3)
parent 73c60599

core/modules/user/src/Controller/UserController.php

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ public function resetPassLogin($uid, $timestamp, $hash, Request $request) { 


    user_login_finalize($user);

    $this->logger->info('User %name used one-time login link at time %timestamp.', ['%name' => $user->getDisplayName(), '%timestamp' => $timestamp]);

    $this->messenger()->addStatus($this->t('You have just used your one-time login link. It is no longer necessary to use this link to log in. It is recommended that you set your password.'));

    $this->messenger()->addStatus($this->t('You have used a one-time login link. You can set your new password now.'));

    // Let the user's password be changed without the current password

    // check.

    $token = Crypt::randomBytesBase64(55);

core/modules/user/tests/src/Functional/UserLoginHttpTest.php

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ protected function loginFromResetEmail() { 
    $resetURL = $urls[0];

    $this->drupalGet($resetURL);

    $this->submitForm([], 'Log in');

    $this->assertSession()->pageTextContains('You have just used your one-time login link. It is no longer necessary to use this link to log in. It is recommended that you set your password.');

    $this->assertSession()->pageTextContains('You have used a one-time login link. You can set your new password now.');

  }



}