Commit 61c6d641 authored by blizzz's avatar blizzz
Browse files

Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exception

Issue 15804 occ user delete exception
parents a672e9d5 cb641b4c
......@@ -119,7 +119,7 @@ class Add extends Command {
);
if ($user instanceof IUser) {
$output->writeln('The user "' . $user->getUID() . '" was created successfully');
$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
} else {
$output->writeln('<error>An error occurred while creating the user</error>');
return 1;
......
......@@ -22,19 +22,20 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputArgument;
class Delete extends Command {
/** @var \OC\User\Manager */
/** @var IUserManager */
protected $userManager;
/**
* @param \OC\User\Manager $userManager
* @param IUserManager $userManager
*/
public function __construct(\OC\User\Manager $userManager) {
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
......@@ -51,11 +52,17 @@ class Delete extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$wasSuccessful = $this->userManager->get($input->getArgument('uid'))->delete();
if($wasSuccessful === true) {
$output->writeln('The specified user was deleted');
$user = $this->userManager->get($input->getArgument('uid'));
if (is_null($user)) {
$output->writeln('<error>User does not exist</error>');
return;
}
if ($user->delete()) {
$output->writeln('<info>The specified user was deleted</info>');
return;
}
$output->writeln('<error>The specified could not be deleted. Please check the logs.</error>');
}
}
......@@ -22,12 +22,24 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputArgument;
class LastSeen extends Command {
/** @var IUserManager */
protected $userManager;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
protected function configure() {
$this
->setName('user:lastseen')
......@@ -40,10 +52,9 @@ class LastSeen extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$userManager = \OC::$server->getUserManager();
$user = $userManager->get($input->getArgument('uid'));
$user = $this->userManager->get($input->getArgument('uid'));
if(is_null($user)) {
$output->writeln('User does not exist');
$output->writeln('<error>User does not exist</error>');
return;
}
......
......@@ -23,11 +23,23 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Report extends Command {
/** @var IUserManager */
protected $userManager;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
protected function configure() {
$this
->setName('user:report')
......@@ -35,6 +47,7 @@ class Report extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
/** @var \Symfony\Component\Console\Helper\TableHelper $table */
$table = $this->getHelperSet()->get('table');
$table->setHeaders(array('User Report', ''));
$userCountArray = $this->countUsers();
......@@ -61,8 +74,7 @@ class Report extends Command {
}
private function countUsers() {
$userManager = \OC::$server->getUserManager();
return $userManager->countUsers();
return $this->userManager->countUsers();
}
private function countUserDirectories() {
......
......@@ -23,6 +23,7 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument;
......@@ -31,10 +32,10 @@ use Symfony\Component\Console\Output\OutputInterface;
class ResetPassword extends Command {
/** @var \OC\User\Manager */
/** @var IUserManager */
protected $userManager;
public function __construct(\OC\User\Manager $userManager) {
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
......@@ -60,10 +61,10 @@ class ResetPassword extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$username = $input->getArgument('user');
/** @var $user \OC\User\User */
/** @var $user \OCP\IUser */
$user = $this->userManager->get($username);
if (is_null($user)) {
$output->writeln("<error>There is no user called " . $username . "</error>");
$output->writeln('<error>User does not exist</error>');
return 1;
}
......
......@@ -42,11 +42,11 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\App\Enable());
$application->add(new OC\Core\Command\App\ListApps());
$application->add(new OC\Core\Command\Maintenance\Repair($repair, \OC::$server->getConfig()));
$application->add(new OC\Core\Command\User\Report());
$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\LastSeen());
$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
......
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace Tests\Core\Command\User;
use OC\Core\Command\User\Delete;
use Test\TestCase;
class DeleteTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $userManager;
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $consoleInput;
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $consoleOutput;
/** @var \Symfony\Component\Console\Command\Command */
protected $command;
protected function setUp() {
parent::setUp();
$userManager = $this->userManager = $this->getMockBuilder('OCP\IUserManager')
->disableOriginalConstructor()
->getMock();
$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
/** @var \OCP\IUserManager $userManager */
$this->command = new Delete($userManager);
}
public function validUserLastSeen() {
return [
[true, 'The specified user was deleted'],
[false, 'The specified could not be deleted'],
];
}
/**
* @dataProvider validUserLastSeen
*
* @param bool $deleteSuccess
* @param string $expectedString
*/
public function testValidUser($deleteSuccess, $expectedString) {
$user = $this->getMock('OCP\IUser');
$user->expects($this->once())
->method('delete')
->willReturn($deleteSuccess);
$this->userManager->expects($this->once())
->method('get')
->with('user')
->willReturn($user);
$this->consoleInput->expects($this->once())
->method('getArgument')
->with('uid')
->willReturn('user');
$this->consoleOutput->expects($this->once())
->method('writeln')
->with($this->stringContains($expectedString));
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
}
public function testInvalidUser() {
$this->userManager->expects($this->once())
->method('get')
->with('user')
->willReturn(null);
$this->consoleInput->expects($this->once())
->method('getArgument')
->with('uid')
->willReturn('user');
$this->consoleOutput->expects($this->once())
->method('writeln')
->with($this->stringContains('User does not exist'));
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
}
}
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace Tests\Core\Command\User;
use OC\Core\Command\User\LastSeen;
use Test\TestCase;
class LastSeenTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $userManager;
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $consoleInput;
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $consoleOutput;
/** @var \Symfony\Component\Console\Command\Command */
protected $command;
protected function setUp() {
parent::setUp();
$userManager = $this->userManager = $this->getMockBuilder('OCP\IUserManager')
->disableOriginalConstructor()
->getMock();
$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
/** @var \OCP\IUserManager $userManager */
$this->command = new LastSeen($userManager);
}
public function validUserLastSeen() {
return [
[0, 'never logged in'],
[time(), 'last login'],
];
}
/**
* @dataProvider validUserLastSeen
*
* @param int $lastSeen
* @param string $expectedString
*/
public function testValidUser($lastSeen, $expectedString) {
$user = $this->getMock('OCP\IUser');
$user->expects($this->once())
->method('getLastLogin')
->willReturn($lastSeen);
$this->userManager->expects($this->once())
->method('get')
->with('user')
->willReturn($user);
$this->consoleInput->expects($this->once())
->method('getArgument')
->with('uid')
->willReturn('user');
$this->consoleOutput->expects($this->once())
->method('writeln')
->with($this->stringContains($expectedString));
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
}
public function testInvalidUser() {
$this->userManager->expects($this->once())
->method('get')
->with('user')
->willReturn(null);
$this->consoleInput->expects($this->once())
->method('getArgument')
->with('uid')
->willReturn('user');
$this->consoleOutput->expects($this->once())
->method('writeln')
->with($this->stringContains('User does not exist'));
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment