Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2855328 by danflanagan8, sourabh.singhal, Pancho, aarti zikre, asad_ahmed, priscarabelli, anushrikumari, ashwinparmar, vikashsoni, cilefen, ideaseed, Archana.Phatangare, quietone, finex, alexpott, catch, smustgrave, sugaroverflow: Password and confirm password should be mandatory fields while setting up password using one time link following by email 

(cherry picked from commit 0b78493d29)
merge-requests/9736/merge
Alex Pott 2024-11-19 09:44:47 +00:00
parent 4c92f5a84d
commit deead9fdad
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/user/src/AccountForm.php
View File

@ -157,9 +157,12 @@ abstract class AccountForm extends ContentEntityForm implements TrustedCallbackI
];
$form_state->set('user', $account);
// The user may only change their own password without their current
// password if they logged in via a one-time login link.
if (!$form_state->get('user_pass_reset')) {
// If logged in via a one-time login link entering a new password is
// required and the user does not need to enter their current password.
if ($form_state->get('user_pass_reset')) {
$form['account']['pass']['#required'] = TRUE;
}
else {
$form['account']['current_pass']['#description'] = $this->t('Required if you want to change the <em>Email address</em> or the <em>Password</em> field below. <a href=":request_new_url" title="Send password reset instructions via email.">Reset your password</a>.', [
':request_new_url' => Url::fromRoute('user.pass')->toString(),
]);

4
core/modules/user/tests/src/Functional/UserPasswordResetTest.php
View File

@ -138,6 +138,10 @@ class UserPasswordResetTest extends BrowserTestBase {
$this->assertSession()->linkExists('Log out');
$this->assertSession()->titleEquals($this->account->getAccountName() . ' | Drupal');
// Try to save without entering password.
$this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Password field is required.');
// Change the forgotten password.
$password = \Drupal::service('password_generator')->generate();
$edit = ['pass[pass1]' => $password, 'pass[pass2]' => $password];