diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-02-24 16:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 16:24:58 +0100 |
| commit | 3c3d0070687e8f8fa21a0e833d1ebb74aa477385 (patch) | |
| tree | ff561c86a4ce75d10c7d42cb21a6d46d4146e8e0 | |
| parent | 1eb8aee0e67bff6b2047157bd1eae0d77338ba21 (diff) | |
| parent | 168f18859636080f0d35a81c1a43c040addf8e40 (diff) | |
| download | nextcloud-server-3c3d0070687e8f8fa21a0e833d1ebb74aa477385.tar.gz nextcloud-server-3c3d0070687e8f8fa21a0e833d1ebb74aa477385.zip | |
Merge pull request #8515 from nextcloud/13-8502
[stable13] Show hint in OCS API for user creation
| -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 ffae68d5a95..22ee0402e4b 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 OCP\App\IAppManager; @@ -187,15 +188,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->error('Failed addUser attempt with exception: '.$e->getMessage(), ['app' => 'ocs_api']); throw new OCSException('Bad request', 101); |