Verified Commit bff52f8e authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Revert "Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time... 

Revert "Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login link instead of user login form in BrowserTestBase tests"

This reverts commit 332f671c.
parent 332f671c

core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ class LocaleTranslatedSchemaDefinitionTest extends BrowserTestBase { 
   */

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}

   */

  protected bool $useOneTimeLoginLinks = FALSE;



  /**

   * {@inheritdoc}

   */

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

+1 −7
Original line number Diff line number Diff line
@@ -169,13 +169,7 @@ public function testPasswordRehashOnLogin(): void { 
    $this->assertTrue($password_hasher->needsRehash($account->getPassword()));



    $account->passRaw = $password;

    $this->drupalGet('user/login');

    $edit = [

      'name' => $account->getAccountName(),

      'pass' => $account->passRaw,

    ];

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



    $this->drupalLogin($account);

    // Load the stored user, which should have a different password hash now.

    $user_storage->resetCache([$account->id()]);

    $account = $user_storage->load($account->id());

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

+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ class UserTokenReplaceTest extends BrowserTestBase { 
   */

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}

   */

  protected bool $useOneTimeLoginLinks = FALSE;



  /**

   * {@inheritdoc}

   */

core/modules/user/user.module

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ function user_user_logout(AccountInterface $account) { 
 *   they can change their password.

 */

function user_pass_reset_url($account, $options = []) {

  $timestamp = \Drupal::time()->getCurrentTime();

  $timestamp = \Drupal::time()->getRequestTime();

  $langcode = $options['langcode'] ?? $account->getPreferredLangcode();

  return Url::fromRoute('user.reset',

    [

core/tests/Drupal/Tests/UiHelperTrait.php

+5 −20
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ trait UiHelperTrait { 
   */

  protected $loggedInUser = FALSE;



  /**

   * Use one-time login links instead of submitting the login form.

   */

  protected bool $useOneTimeLoginLinks = TRUE;



  /**

   * The number of meta refresh redirects to follow, or NULL if unlimited.

   *
@@ -161,21 +156,11 @@ protected function drupalLogin(AccountInterface $account) { 
      $this->drupalLogout();

    }



    if ($this->useOneTimeLoginLinks) {

      // Reload to get latest login timestamp.

      $storage = \Drupal::entityTypeManager()->getStorage('user');

      /** @var \Drupal\user\UserInterface $accountUnchanged */

      $accountUnchanged = $storage->loadUnchanged($account->id());

      $login = user_pass_reset_url($accountUnchanged) . '/login?destination=user/' . $account->id();

      $this->drupalGet($login);

    }

    else {

    $this->drupalGet(Url::fromRoute('user.login'));

    $this->submitForm([

      'name' => $account->getAccountName(),

      'pass' => $account->passRaw,

    ], 'Log in');

    }



    // @see ::drupalUserIsLoggedIn()

    $account->sessionId = $this->getSession()->getCookie(\Drupal::service('session_configuration')->getOptions(\Drupal::request())['name']);