wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19723 from nextcloud/bug/18603/avatar-response

Browse source 
Always use status 200 for avatar response
This commit is contained in:
Roeland Jago Douma 2020-03-03 16:15:14 +01:00 committed by GitHub
commit 6ea1aef031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Controller/AvatarController.php
View file

@ -144,8 +144,8 @@ class AvatarController extends Controller {
$avatarFile = $avatar->getFile($size); $avatarFile = $avatar->getFile($size);
$response = new FileDisplayResponse( $response = new FileDisplayResponse(
$avatarFile, $avatarFile,
$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED, Http::STATUS_OK,
['Content-Type' => $avatarFile->getMimeType()] ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
); );
} catch (\Exception $e) { } catch (\Exception $e) {
return new JSONResponse([], Http::STATUS_NOT_FOUND); return new JSONResponse([], Http::STATUS_NOT_FOUND);

6
tests/Core/Controller/AvatarControllerTest.php
View file

@ -193,6 +193,8 @@ class AvatarControllerTest extends \Test\TestCase {
$this->assertEquals(Http::STATUS_OK, $response->getStatus()); $this->assertEquals(Http::STATUS_OK, $response->getStatus());
$this->assertArrayHasKey('Content-Type', $response->getHeaders()); $this->assertArrayHasKey('Content-Type', $response->getHeaders());
$this->assertEquals('image type', $response->getHeaders()['Content-Type']); $this->assertEquals('image type', $response->getHeaders()['Content-Type']);
$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
$this->assertEquals('1', $response->getHeaders()['X-NC-IsCustomAvatar']);
$this->assertEquals('my etag', $response->getETag()); $this->assertEquals('my etag', $response->getETag());
} }
@ -206,9 +208,11 @@ class AvatarControllerTest extends \Test\TestCase {
$response = $this->avatarController->getAvatar('userId', 32); $response = $this->avatarController->getAvatar('userId', 32);
$this->assertEquals(Http::STATUS_CREATED, $response->getStatus()); $this->assertEquals(Http::STATUS_OK, $response->getStatus());
$this->assertArrayHasKey('Content-Type', $response->getHeaders()); $this->assertArrayHasKey('Content-Type', $response->getHeaders());
$this->assertEquals('image type', $response->getHeaders()['Content-Type']); $this->assertEquals('image type', $response->getHeaders()['Content-Type']);
$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
$this->assertEquals('0', $response->getHeaders()['X-NC-IsCustomAvatar']);
$this->assertEquals('my etag', $response->getETag()); $this->assertEquals('my etag', $response->getETag());
} }