Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Fix the token exception classes to avoid infinite loop with getPrevious #71

Merged
merged 1 commit into from
Sep 13, 2018
Merged

Fix the token exception classes to avoid infinite loop with getPrevious #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/Controller/UsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ public function setPasswordForm($token, $userId) {
try {
$this->checkPasswordSetToken($token, $userId);
} catch (UserTokenException $e) {
if ($e->getPrevious() instanceof UserTokenExpiredException) {
if ($e instanceof UserTokenExpiredException) {
return new TemplateResponse(
'user_management', 'new_user/resendtokenbymail',
[
Expand Down
4 changes: 2 additions & 2 deletions lib/Exception/InvalidUserTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace OCA\UserManagement\Exception;

class InvalidUserTokenException extends UserTokenException {
public function __construct($message = "", $code = 0) {
parent::__construct($message, $code, $this);
public function __construct($message = "", $code = 0, \Exception $previous = null) {
parent::__construct($message, $code, $previous);
}
}
4 changes: 2 additions & 2 deletions lib/Exception/UserTokenExpiredException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace OCA\UserManagement\Exception;

class UserTokenExpiredException extends UserTokenException {
public function __construct($message = "", $code = 0) {
parent::__construct($message, $code, $this);
public function __construct($message = "", $code = 0, \Exception $previous = null) {
parent::__construct($message, $code, $previous);
}
}
5 changes: 3 additions & 2 deletions lib/Exception/UserTokenMismatchException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
namespace OCA\UserManagement\Exception;

class UserTokenMismatchException extends UserTokenException {
public function __construct($message = "", $code = 0) {
parent::__construct($message, $code, $this);
public function __construct($message = "", $code = 0, \Exception $previous = null) {
$this->previousException = $this;
parent::__construct($message, $code, $previous);
}
}