Merge pull request #19052 from owncloud/revert-14856-remote_avatars
Revert "Allow Remote avatars"
This commit is contained in:
commit
ac1239220d
|
@ -90,18 +90,14 @@ class AvatarController extends Controller {
|
|||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*
|
||||
* @param string $userId
|
||||
* @param int $size
|
||||
* @return DataResponse|DataDisplayResponse
|
||||
*/
|
||||
public function getAvatar($userId, $size) {
|
||||
if (!$this->userManager->userExists($userId)) {
|
||||
return new DataResponse([], Http::STATUS_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($size > 2048) {
|
||||
$size = 2048;
|
||||
} elseif ($size <= 0) {
|
||||
|
|
|
@ -96,12 +96,8 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
// Configure userMock
|
||||
$this->userMock->method('getDisplayName')->willReturn($this->user);
|
||||
$this->userMock->method('getUID')->willReturn($this->user);
|
||||
$this->container['UserManager']
|
||||
->method('get')
|
||||
$this->container['UserManager']->method('get')
|
||||
->willReturnMap([[$this->user, $this->userMock]]);
|
||||
$this->container['UserManager']
|
||||
->method('userExists')
|
||||
->willReturnMap([[$this->user, true]]);
|
||||
$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
|
||||
|
||||
}
|
||||
|
@ -124,10 +120,11 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
* Fetch an avatar if a user has no avatar
|
||||
*/
|
||||
public function testGetAvatarNoAvatar() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
|
||||
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
|
||||
$response = $this->avatarController->getAvatar($this->user, 32);
|
||||
|
||||
//Comment out until JS is fixed
|
||||
//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
|
||||
$this->assertEquals(Http::STATUS_OK, $response->getStatus());
|
||||
$this->assertEquals($this->user, $response->getData()['data']['displayname']);
|
||||
}
|
||||
|
@ -136,11 +133,9 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
* Fetch the user's avatar
|
||||
*/
|
||||
public function testGetAvatar() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
|
||||
$image = new Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
|
||||
$this->avatarMock->expects($this->once())->method('get')->willReturn($image);
|
||||
$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
|
||||
$this->avatarMock->method('get')->willReturn($image);
|
||||
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
|
||||
|
||||
$response = $this->avatarController->getAvatar($this->user, 32);
|
||||
|
||||
|
@ -155,19 +150,21 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
* Fetch the avatar of a non-existing user
|
||||
*/
|
||||
public function testGetAvatarNoUser() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
$this->avatarMock->method('get')->willReturn(null);
|
||||
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
|
||||
|
||||
$response = $this->avatarController->getAvatar($this->user . 'doesnotexist', 32);
|
||||
|
||||
//Comment out until JS is fixed
|
||||
$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
|
||||
$this->assertEquals([], $response->getData());
|
||||
//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
|
||||
$this->assertEquals(Http::STATUS_OK, $response->getStatus());
|
||||
$this->assertEquals('', $response->getData()['data']['displayname']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Make sure we get the correct size
|
||||
*/
|
||||
public function testGetAvatarSize() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
$this->avatarMock->expects($this->once())
|
||||
->method('get')
|
||||
->with($this->equalTo(32));
|
||||
|
@ -181,7 +178,6 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
* We cannot get avatars that are 0 or negative
|
||||
*/
|
||||
public function testGetAvatarSizeMin() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
$this->avatarMock->expects($this->once())
|
||||
->method('get')
|
||||
->with($this->equalTo(64));
|
||||
|
@ -195,7 +191,6 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
* We do not support avatars larger than 2048*2048
|
||||
*/
|
||||
public function testGetAvatarSizeMax() {
|
||||
$this->container['UserManager']->expects($this->once())->method('userExists');
|
||||
$this->avatarMock->expects($this->once())
|
||||
->method('get')
|
||||
->with($this->equalTo(2048));
|
||||
|
|
Loading…
Reference in New Issue