upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #33625 from nextcloud/fix/33572/add-user

Browse source 
Fix creation of new user and display the correct error message
This commit is contained in:
Vincent Petry 2022-09-01 17:07:13 +02:00 committed by GitHub
commit 253c0641b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/provisioning_api/lib/Controller/UsersController.php
View file

@ -426,7 +426,14 @@ class UsersController extends AUserData {
}
if ($displayName !== '') {
$this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
try {
$this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
} catch (OCSException $e) {
if ($newUser instanceof IUser) {
$newUser->delete();
}
throw $e;
}
}
if ($quota !== '') {
@ -837,8 +844,10 @@ class UsersController extends AUserData {
switch ($key) {
case self::USER_FIELD_DISPLAYNAME:
case IAccountManager::PROPERTY_DISPLAYNAME:
if (!$targetUser->setDisplayName($value)) {
throw new OCSException('Invalid displayname', 102);
try {
$targetUser->setDisplayName($value);
} catch (InvalidArgumentException $e) {
throw new OCSException($e->getMessage(), 101);
}
break;
case self::USER_FIELD_QUOTA:

4
lib/private/User/Database.php
View file

@ -212,11 +212,13 @@ class Database extends ABackend implements
* @param string $displayName The new display name
* @return bool
*
* @throws \InvalidArgumentException
*
* Change the display name of a user
*/
public function setDisplayName(string $uid, string $displayName): bool {
if (mb_strlen($displayName) > 64) {
return false;
throw new \InvalidArgumentException('Invalid displayname');
}
$this->fixDI();

3
lib/private/User/User.php
View file

@ -154,6 +154,9 @@ class User implements IUser {
*
* @param string $displayName
* @return bool
*
* @since 25.0.0 Throw InvalidArgumentException
* @throws \InvalidArgumentException
*/
public function setDisplayName($displayName) {
$displayName = trim($displayName);

3
lib/public/IUser.php
View file

@ -58,6 +58,9 @@ interface IUser {
* @param string $displayName
* @return bool
* @since 8.0.0
*
* @since 25.0.0 Throw InvalidArgumentException
* @throws \InvalidArgumentException
*/
public function setDisplayName($displayName);

3
lib/public/User/Backend/ISetDisplayNameBackend.php
View file

@ -36,6 +36,9 @@ interface ISetDisplayNameBackend {
* @param string $uid The username
* @param string $displayName The new display name
* @return bool
*
* @since 25.0.0 Throw InvalidArgumentException
* @throws \InvalidArgumentException
*/
public function setDisplayName(string $uid, string $displayName): bool;
}