Merge pull request 'allow error string to be null in case the password was correct' (#39) from bugfix/account-cannot-be-deleted into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/39
Reviewed-by: Pőcze Bence <bence@pocze.ch>
This commit is contained in:
Balázs Vigh 2021-05-08 20:57:37 +02:00
commit ed8e1773c4

View File

@ -210,7 +210,7 @@ class UserController implements ISecured
return new JsonContent(['success' => true]); return new JsonContent(['success' => true]);
} }
private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, string &$error): bool private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, ?string &$error): bool
{ {
if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) { if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) {
return true; return true;