Skip to content

Commit d785bcd

Browse files
skjnldsvskjnldsv
authored
Merge pull request #53920 from nextcloud/revert-53918-revert-53141-perf/files/setup-fs-basic-auth-request
2 parents f383db2 + e38dfef commit d785bcd

File tree

18 files changed

+27
-930
lines changed

18 files changed

+27
-930
lines changed

‎apps/files_sharing/tests/TestCase.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ protected function loginHelper($user, $create = false, $password = false) {
196196
Server::get(IUserSession::class)->setUser(null);
197197
Filesystem::tearDown();
198198
Server::get(IUserSession::class)->login($user, $password);
199+
Filesystem::initMountPoints($user);
199200
\OC::$server->getUserFolder($user);
200201

201202
\OC_Util::setupFS($user);

‎apps/settings/src/components/PersonalInfo/AvatarSection.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ export default {
182182
if (data.status === 'success') {
183183
this.handleAvatarUpdate(false)
184184
} else if (data.data === 'notsquare') {
185-
const tempAvatar = generateUrl('/avatar/tmp') + '?requesttoken=' + encodeURIComponent(OC.requestToken) + '#' + Math.floor(Math.random() * 1000)
186-
this.$refs.cropper.replace(tempAvatar)
185+
this.$refs.cropper.replace(data.image)
187186
this.showCropper = true
188187
} else {
189188
showError(data.data.message)

‎build/integration/features/avatar.feature‎

Lines changed: 5 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,9 @@ Feature: avatar
2121
And last avatar is a square of size 512
2222
And last avatar is not a single color
2323

24-
25-
26-
Scenario: get temporary non-square user avatar before cropping it
27-
Given Logging in using web as "user0"
28-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
29-
When logged in user gets temporary avatar
30-
Then The following headers should be set
31-
| Content-Type | image/png |
32-
# "last avatar" also includes the last temporary avatar
33-
And last avatar is not a square
34-
And last avatar is not a single color
35-
36-
Scenario: get non-square user avatar before cropping it
37-
Given Logging in using web as "user0"
38-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
39-
# Avatar needs to be cropped to finish setting it
40-
When user "user0" gets avatar for user "user0"
41-
Then The following headers should be set
42-
| Content-Type | image/png |
43-
| X-NC-IsCustomAvatar | 0 |
44-
And last avatar is a square of size 512
45-
And last avatar is not a single color
46-
4724
Scenario: set square user avatar from file
4825
Given Logging in using web as "user0"
49-
When logged in user posts temporary avatar from file "data/green-square-256.png"
26+
When logged in user posts avatar from file "data/green-square-256.png"
5027
And user "user0" gets avatar for user "user0"
5128
And The following headers should be set
5229
| Content-Type | image/png |
@@ -64,7 +41,7 @@ Feature: avatar
6441
Scenario: set square user avatar from internal path
6542
Given user "user0" uploads file "data/green-square-256.png" to "/internal-green-square-256.png"
6643
And Logging in using web as "user0"
67-
When logged in user posts temporary avatar from internal path "internal-green-square-256.png"
44+
When logged in user posts avatar from internal path "internal-green-square-256.png"
6845
And user "user0" gets avatar for user "user0" with size "64"
6946
And The following headers should be set
7047
| Content-Type | image/png |
@@ -78,82 +55,21 @@ Feature: avatar
7855
And last avatar is a square of size 64
7956
And last avatar is a single "#00FF00" color
8057

81-
Scenario: set non-square user avatar from file
82-
Given Logging in using web as "user0"
83-
When logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
84-
And logged in user crops temporary avatar
85-
| x | 384 |
86-
| y | 256 |
87-
| w | 128 |
88-
| h | 128 |
89-
Then logged in user gets temporary avatar with 404
90-
And user "user0" gets avatar for user "user0"
91-
And The following headers should be set
92-
| Content-Type | image/png |
93-
| X-NC-IsCustomAvatar | 1 |
94-
And last avatar is a square of size 512
95-
And last avatar is a single "#FF0000" color
96-
And user "anonymous" gets avatar for user "user0"
97-
And The following headers should be set
98-
| Content-Type | image/png |
99-
| X-NC-IsCustomAvatar | 1 |
100-
And last avatar is a square of size 512
101-
And last avatar is a single "#FF0000" color
102-
103-
Scenario: set non-square user avatar from internal path
104-
Given user "user0" uploads file "data/coloured-pattern-non-square.png" to "/internal-coloured-pattern-non-square.png"
105-
And Logging in using web as "user0"
106-
When logged in user posts temporary avatar from internal path "internal-coloured-pattern-non-square.png"
107-
And logged in user crops temporary avatar
108-
| x | 704 |
109-
| y | 320 |
110-
| w | 64 |
111-
| h | 64 |
112-
Then logged in user gets temporary avatar with 404
113-
And user "user0" gets avatar for user "user0" with size "64"
114-
And The following headers should be set
115-
| Content-Type | image/png |
116-
| X-NC-IsCustomAvatar | 1 |
117-
And last avatar is a square of size 64
118-
And last avatar is a single "#00FF00" color
119-
And user "anonymous" gets avatar for user "user0" with size "64"
120-
And The following headers should be set
121-
| Content-Type | image/png |
122-
| X-NC-IsCustomAvatar | 1 |
123-
And last avatar is a square of size 64
124-
And last avatar is a single "#00FF00" color
125-
126-
Scenario: cropped user avatar needs to be squared
127-
Given Logging in using web as "user0"
128-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
129-
When logged in user crops temporary avatar with 400
130-
| x | 384 |
131-
| y | 256 |
132-
| w | 192 |
133-
| h | 128 |
134-
135-
136-
13758
Scenario: delete user avatar
13859
Given Logging in using web as "user0"
139-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
140-
And logged in user crops temporary avatar
141-
| x | 384 |
142-
| y | 256 |
143-
| w | 128 |
144-
| h | 128 |
60+
And logged in user posts avatar from file "data/green-square-256.png"
14561
And user "user0" gets avatar for user "user0"
14662
And The following headers should be set
14763
| Content-Type | image/png |
14864
| X-NC-IsCustomAvatar | 1 |
14965
And last avatar is a square of size 512
150-
And last avatar is a single "#FF0000" color
66+
And last avatar is a single "#00FF00" color
15167
And user "anonymous" gets avatar for user "user0"
15268
And The following headers should be set
15369
| Content-Type | image/png |
15470
| X-NC-IsCustomAvatar | 1 |
15571
And last avatar is a square of size 512
156-
And last avatar is a single "#FF0000" color
72+
And last avatar is a single "#00FF00" color
15773
When logged in user deletes the user avatar
15874
Then user "user0" gets avatar for user "user0"
15975
And The following headers should be set
@@ -168,40 +84,6 @@ Feature: avatar
16884
And last avatar is a square of size 512
16985
And last avatar is not a single color
17086

171-
172-
173-
Scenario: get user avatar with a larger size than the original one
174-
Given Logging in using web as "user0"
175-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
176-
And logged in user crops temporary avatar
177-
| x | 384 |
178-
| y | 256 |
179-
| w | 128 |
180-
| h | 128 |
181-
When user "user0" gets avatar for user "user0" with size "192"
182-
Then The following headers should be set
183-
| Content-Type | image/png |
184-
| X-NC-IsCustomAvatar | 1 |
185-
And last avatar is a square of size 512
186-
And last avatar is a single "#FF0000" color
187-
188-
Scenario: get user avatar with a smaller size than the original one
189-
Given Logging in using web as "user0"
190-
And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
191-
And logged in user crops temporary avatar
192-
| x | 384 |
193-
| y | 256 |
194-
| w | 128 |
195-
| h | 128 |
196-
When user "user0" gets avatar for user "user0" with size "96"
197-
Then The following headers should be set
198-
| Content-Type | image/png |
199-
| X-NC-IsCustomAvatar | 1 |
200-
And last avatar is a square of size 512
201-
And last avatar is a single "#FF0000" color
202-
203-
204-
20587
Scenario: get default guest avatar
20688
When user "user0" gets avatar for guest "guest0"
20789
Then The following headers should be set

‎build/integration/features/bootstrap/Avatar.php‎

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
55
* SPDX-License-Identifier: AGPL-3.0-or-later
66
*/
7-
use Behat\Gherkin\Node\TableNode;
87
use PHPUnit\Framework\Assert;
98

109
require __DIR__ . '/../../vendor/autoload.php';
@@ -68,30 +67,11 @@ public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
6867
}
6968

7069
/**
71-
* @When logged in user gets temporary avatar
72-
*/
73-
public function loggedInUserGetsTemporaryAvatar() {
74-
$this->loggedInUserGetsTemporaryAvatarWith('200');
75-
}
76-
77-
/**
78-
* @When logged in user gets temporary avatar with :statusCode
79-
*
80-
* @param string $statusCode
81-
*/
82-
public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) {
83-
$this->sendingAToWithRequesttoken('GET', '/index.php/avatar/tmp');
84-
$this->theHTTPStatusCodeShouldBe($statusCode);
85-
86-
$this->getLastAvatar();
87-
}
88-
89-
/**
90-
* @When logged in user posts temporary avatar from file :source
70+
* @When logged in user posts avatar from file :source
9171
*
9272
* @param string $source
9373
*/
94-
public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
74+
public function loggedInUserPostsAvatarFromFile(string $source) {
9575
$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
9676

9777
$this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
@@ -107,40 +87,15 @@ public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
10787
}
10888

10989
/**
110-
* @When logged in user posts temporary avatar from internal path :path
90+
* @When logged in user posts avatar from internal path :path
11191
*
11292
* @param string $path
11393
*/
114-
public function loggedInUserPostsTemporaryAvatarFromInternalPath(string $path) {
94+
public function loggedInUserPostsAvatarFromInternalPath(string $path) {
11595
$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
11696
$this->theHTTPStatusCodeShouldBe('200');
11797
}
11898

119-
/**
120-
* @When logged in user crops temporary avatar
121-
*
122-
* @param TableNode $crop
123-
*/
124-
public function loggedInUserCropsTemporaryAvatar(TableNode $crop) {
125-
$this->loggedInUserCropsTemporaryAvatarWith('200', $crop);
126-
}
127-
128-
/**
129-
* @When logged in user crops temporary avatar with :statusCode
130-
*
131-
* @param string $statusCode
132-
* @param TableNode $crop
133-
*/
134-
public function loggedInUserCropsTemporaryAvatarWith(string $statusCode, TableNode $crop) {
135-
$parameters = [];
136-
foreach ($crop->getRowsHash() as $key => $value) {
137-
$parameters[] = 'crop[' . $key . ']=' . $value;
138-
}
139-
140-
$this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?' . implode('&', $parameters));
141-
$this->theHTTPStatusCodeShouldBe($statusCode);
142-
}
143-
14499
/**
145100
* @When logged in user deletes the user avatar
146101
*/

‎build/integration/sharing_features/sharing-v1-part3.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Feature: sharing
4646
Scenario: Correct webdav share-permissions for owned folder
4747
Given user "user0" exists
4848
And user "user0" created a folder "/tmp"
49-
When as "user0" gets properties of folder "/" with
49+
When as "user0" gets properties of folder "/tmp" with
5050
|{http://open-collaboration-services.org/ns}share-permissions |
5151
Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "31"
5252

‎build/psalm-baseline.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3447,17 +3447,6 @@
34473447
<code><![CDATA[$this->providers]]></code>
34483448
</UndefinedInterfaceMethod>
34493449
</file>
3450-
<file src="lib/private/Cache/CappedMemoryCache.php">
3451-
<MissingTemplateParam>
3452-
<code><![CDATA[\ArrayAccess]]></code>
3453-
</MissingTemplateParam>
3454-
</file>
3455-
<file src="lib/private/Cache/File.php">
3456-
<LessSpecificImplementedReturnType>
3457-
<code><![CDATA[bool|mixed]]></code>
3458-
<code><![CDATA[bool|mixed]]></code>
3459-
</LessSpecificImplementedReturnType>
3460-
</file>
34613450
<file src="lib/private/Calendar/Manager.php">
34623451
<LessSpecificReturnStatement>
34633452
<code><![CDATA[array_merge(

0 commit comments

Comments
 (0)