X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fauth%2FLocalPasswordPrimaryAuthenticationProvider.php;h=7f93c12d4c330d4087e2b3fa5c4ad5fc903af1d6;hp=859fd0c6506e952149a55e3c1771514db11a67c1;hb=509c8d6e378a8decae43dcb27276ddae40dc1143;hpb=ff70e103def9601f40836cbd9022e1267200510e diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php index 859fd0c650..7f93c12d4c 100644 --- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php +++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php @@ -242,14 +242,14 @@ class LocalPasswordPrimaryAuthenticationProvider $pwhash = null; - if ( $this->loginOnly ) { - $pwhash = $this->getPasswordFactory()->newFromCiphertext( null ); - $expiry = null; - // @codeCoverageIgnoreStart - } elseif ( get_class( $req ) === PasswordAuthenticationRequest::class ) { - // @codeCoverageIgnoreEnd - $pwhash = $this->getPasswordFactory()->newFromPlaintext( $req->password ); - $expiry = $this->getNewPasswordExpiry( $username ); + if ( get_class( $req ) === PasswordAuthenticationRequest::class ) { + if ( $this->loginOnly ) { + $pwhash = $this->getPasswordFactory()->newFromCiphertext( null ); + $expiry = null; + } else { + $pwhash = $this->getPasswordFactory()->newFromPlaintext( $req->password ); + $expiry = $this->getNewPasswordExpiry( $username ); + } } if ( $pwhash ) { @@ -297,7 +297,7 @@ class LocalPasswordPrimaryAuthenticationProvider // Nothing we can do besides claim it, because the user isn't in // the DB yet if ( $req->username !== $user->getName() ) { - $req = clone( $req ); + $req = clone $req; $req->username = $user->getName(); } $ret = AuthenticationResponse::newPass( $req->username );