clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Throw exception when user has delegates in User::remove

This commit is contained in:
Hypolite Petovan 2023-07-27 17:12:05 +02:00
parent 3a42849759
commit 1f7b6a63bb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Model/User.php
View File

@ -37,11 +37,10 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Module; use Friendica\Module;
use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\Delivery; use Friendica\Protocol\Delivery;
use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images; use Friendica\Util\Images;
@ -1638,16 +1637,24 @@ class User
* @param int $uid user to remove * @param int $uid user to remove
* @return bool * @return bool
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws HTTPException\NotFoundException
*/ */
public static function remove(int $uid): bool public static function remove(int $uid): bool
{ {
if (empty($uid)) { if (empty($uid)) {
return false; throw new \InvalidArgumentException('uid needs to be greater than 0');
} }
Logger::notice('Removing user', ['user' => $uid]); Logger::notice('Removing user', ['user' => $uid]);
$user = DBA::selectFirst('user', [], ['uid' => $uid]); $user = self::getById($uid);
if (!$user) {
throw new HTTPException\NotFoundException('User not found with uid: ' . $uid);
}
if (DBA::exists('user', ['parent-uid' => $uid])) {
throw new \RuntimeException(DI::l10n()->t("User with delegates can't be removed, please remove delegate users first"));
}
Hook::callAll('remove_user', $user); Hook::callAll('remove_user', $user);