diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-23 10:02:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 10:02:31 +0100 |
| commit | 98baf8915dcaba69266820066cb49abbcc43e624 (patch) | |
| tree | 9bcad861cb3fbe7b2f430aa209d8f59786cfb82e /apps | |
| parent | 68187e6036b0eedc9dcfab78001cc1f1ad81ce83 (diff) | |
| parent | 9aaf1c2a062a543a5ed22ec3346b71f312d6d4ff (diff) | |
| download | nextcloud-server-98baf8915dcaba69266820066cb49abbcc43e624.tar.gz nextcloud-server-98baf8915dcaba69266820066cb49abbcc43e624.zip | |
Merge pull request #8502 from nextcloud/properly-show-hints-in-ocs
Show hint in OCS API for user creation
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 99f1a0ddd57..402381ab58a 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -31,6 +31,7 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; +use OC\HintException; use OC\Settings\Mailer\NewUserMailHelper; use OC_Helper; use OCA\Provisioning_API\FederatedFileSharingFactory; @@ -193,15 +194,22 @@ class UsersController extends OCSController { try { $newUser = $this->userManager->createUser($userid, $password); - $this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']); + $this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']); if (is_array($groups)) { foreach ($groups as $group) { $this->groupManager->get($group)->addUser($newUser); - $this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']); + $this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']); } } return new DataResponse(); + } catch (HintException $e ) { + $this->logger->logException($e, [ + 'message' => 'Failed addUser attempt with hint exception.', + 'level' => \OCP\Util::WARN, + 'app' => 'ocs_api', + ]); + throw new OCSException($e->getHint(), 107); } catch (\Exception $e) { $this->logger->logException($e, [ 'message' => 'Failed addUser attempt with exception.', |