diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-03 16:15:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 16:15:14 +0100 |
| commit | 6ea1aef0315fa2812ad80e0af8456531e19ea642 (patch) | |
| tree | 90d0dfb13f3adbede6ed096ab8b2606304548ee8 | |
| parent | 57707aaec670cadcbc44b1fd35b2330232d025f1 (diff) | |
| parent | 68148f4073948a39e7247c3e9b5e6a4317d25fd0 (diff) | |
| download | nextcloud-server-6ea1aef0315fa2812ad80e0af8456531e19ea642.tar.gz nextcloud-server-6ea1aef0315fa2812ad80e0af8456531e19ea642.zip | |
Merge pull request #19723 from nextcloud/bug/18603/avatar-response
Always use status 200 for avatar response
| -rw-r--r-- | core/Controller/AvatarController.php | 4 | ||||
| -rw-r--r-- | tests/Core/Controller/AvatarControllerTest.php | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 5ecdc91db24..ac07129a04f 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -144,8 +144,8 @@ class AvatarController extends Controller { $avatarFile = $avatar->getFile($size); $response = new FileDisplayResponse( $avatarFile, - $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED, - ['Content-Type' => $avatarFile->getMimeType()] + Http::STATUS_OK, + ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()] ); } catch (\Exception $e) { return new JSONResponse([], Http::STATUS_NOT_FOUND); diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 284c82310a1..5c66c06a2c5 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -193,6 +193,8 @@ class AvatarControllerTest extends \Test\TestCase { $this->assertEquals(Http::STATUS_OK, $response->getStatus()); $this->assertArrayHasKey('Content-Type', $response->getHeaders()); $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()); } @@ -206,9 +208,11 @@ class AvatarControllerTest extends \Test\TestCase { $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->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()); } |