Skip to content

[stable17] Fix password reset saying Admin changed my password when reset from login page #21231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Jun 4, 2020
Merged

[stable17] Fix password reset saying Admin changed my password when reset from login page #21231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb066ce
Fix password reset saying Admin changed my password when reset from
tcitworld Apr 10, 2020
bdb6589
Use \OC::$CLI instead of PHP_SAPI
tcitworld Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion settings/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Provider implements IProvider {
public const PASSWORD_CHANGED_BY = 'password_changed_by';
public const PASSWORD_CHANGED_SELF = 'password_changed_self';
public const PASSWORD_RESET = 'password_changed';
public const PASSWORD_RESET_SELF = 'password_reset_self';
public const EMAIL_CHANGED_BY = 'email_changed_by';
public const EMAIL_CHANGED_SELF = 'email_changed_self';
public const EMAIL_CHANGED = 'email_changed';
Expand Down Expand Up @@ -102,7 +103,8 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
$subject = $this->l->t('You changed your password');
} else if ($event->getSubject() === self::PASSWORD_RESET) {
$subject = $this->l->t('Your password was reset by an administrator');

} else if ($event->getSubject() === self::PASSWORD_RESET_SELF) {
$subject = $this->l->t('Your password was reset');
} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
$subject = $this->l->t('{actor} changed your email address');
} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
Expand Down Expand Up @@ -143,6 +145,7 @@ protected function getParameters(IEvent $event): array {
switch ($subject) {
case self::PASSWORD_CHANGED_SELF:
case self::PASSWORD_RESET:
case self::PASSWORD_RESET_SELF:
case self::EMAIL_CHANGED_SELF:
case self::EMAIL_CHANGED:
return [];
Expand Down
13 changes: 11 additions & 2 deletions settings/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public function onChangePassword($uid) {
$actor = $this->userSession->getUser();
if ($actor instanceof IUser) {
if ($actor->getUID() !== $user->getUID()) {
// Admin changed the password through the user panel
$this->l = $this->languageFactory->get(
'settings',
$this->config->getUserValue(
Expand All @@ -116,13 +117,21 @@ public function onChangePassword($uid) {
$event->setAuthor($actor->getUID())
->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
} else {
// User changed their password themselves through settings
$text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
$event->setAuthor($actor->getUID())
->setSubject(Provider::PASSWORD_CHANGED_SELF);
}
} else {
$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
$event->setSubject(Provider::PASSWORD_RESET);
if (\OC::$CLI) {
// Admin used occ to reset the password
$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
$event->setSubject(Provider::PASSWORD_RESET);
} else {
// User reset their password from Lost page
$text = $this->l->t('Your password on %s was reset.', [$instanceUrl]);
$event->setSubject(Provider::PASSWORD_RESET_SELF);
}
}

$this->activityManager->publish($event);
Expand Down