Skip to content

Revert "[stable10] Backport of Convert shareWith to lower case" #35449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharidas merged 3 commits into from
Jun 7, 2019
Merged

Revert "[stable10] Backport of Convert shareWith to lower case" #35449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b447ea6
Revert "[stable10] Backport of Convert shareWith to lower case"
micbar Jun 6, 2019
2b362fb
API share_with user response is now case sensitive
phil-davis Jun 7, 2019
d6e723b
Issue 35382 is resolved - webUI sharing to uppercase username works
phil-davis Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/files_sharing/lib/Controller/Share20OcsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,6 @@ public function createShare() {

$globalAutoAccept = $this->config->getAppValue('core', 'shareapi_auto_accept_share', 'yes') === 'yes';
if ($shareType === Share::SHARE_TYPE_USER) {
//Lower the case if the share type is user
if (($shareWith !== null) && ($shareWith !== '')) {
$shareWith = \strtolower($shareWith);
}
$userAutoAccept = false;
if ($globalAutoAccept) {
$userAutoAccept = $this->config->getUserValue($shareWith, 'files_sharing', 'auto_accept_share', 'yes') === 'yes';
Expand Down
6 changes: 3 additions & 3 deletions apps/files_sharing/tests/Controller/Share20OcsControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ public function testCreateShareUser() {
->with('valid-path')
->willReturn($path);

$this->userManager->method('userExists')->with('validuser')->willReturn(true);
$this->userManager->method('userExists')->with('validUser')->willReturn(true);

$path->expects($this->once())
->method('lock')
Expand All @@ -921,7 +921,7 @@ public function testCreateShareUser() {
~\OCP\Constants::PERMISSION_CREATE
) &&
$share->getShareType() === Share::SHARE_TYPE_USER &&
$share->getSharedWith() === 'validuser' &&
$share->getSharedWith() === 'validUser' &&
$share->getSharedBy() === 'currentUser';
}))
->will($this->returnArgument(0));
Expand Down Expand Up @@ -1587,7 +1587,7 @@ public function testCreateReshareOfFederatedMountNoDeletePermissions() {
->with('valid-path')
->willReturn($path);

$this->userManager->method('userExists')->with('validuser')->willReturn(true);
$this->userManager->method('userExists')->with('validUser')->willReturn(true);

$this->shareManager
->expects($this->once())
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/apiShareManagementBasic/createShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ Feature: sharing
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And the fields of the last response should include
| share_with | user1 |
| share_with | USER1 |
| file_target | /welcome.txt |
| path | /welcome.txt |
| permissions | 19 |
Expand Down
4 changes: 1 addition & 3 deletions tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@ Feature: Sharing files and folders with internal users
When the user opens the share dialog for file "lorem.txt"
Then the user should not be able to send the share notification by email using the webUI

@issue-35382
Scenario: user shares a file with another user with uppercase username
Given user "user1" has been created with default attributes and skeleton files
And these users have been created without skeleton files:
Expand All @@ -339,5 +338,4 @@ Feature: Sharing files and folders with internal users
When the user shares file "lorem.txt" with user "SomeUser" using the webUI
And the user re-logs in as "SomeUser" using the webUI
And the user browses to the shared-with-you page
Then file "lorem.txt" should not be listed on the webUI
# Then file "lorem.txt" should be listed on the webUI
Then file "lorem.txt" should be listed on the webUI