Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
our_own_cloud_project
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
7ae19811
Unverified
Commit
7ae19811
authored
Mar 29, 2017
by
Vincent Petry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep share link name if not specified in update call
parent
ff126a53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
86 additions
and
3 deletions
+86
-3
apps/files_sharing/lib/API/Share20OCS.php
apps/files_sharing/lib/API/Share20OCS.php
+9
-3
apps/files_sharing/tests/API/Share20OCSTest.php
apps/files_sharing/tests/API/Share20OCSTest.php
+77
-0
No files found.
apps/files_sharing/lib/API/Share20OCS.php
View file @
7ae19811
...
...
@@ -356,7 +356,10 @@ class Share20OCS {
$share
->
setPermissions
(
\
OCP\Constants
::
PERMISSION_READ
);
}
$share
->
setName
(
$name
);
// set name only if passed as parameter, empty string is allowed
if
(
$name
!==
null
)
{
$share
->
setName
(
$name
);
}
// Set password
$password
=
$this
->
request
->
getParam
(
'password'
,
''
);
...
...
@@ -594,7 +597,7 @@ class Share20OCS {
* expirationdate, password and publicUpload only make sense for link shares
*/
if
(
$share
->
getShareType
()
===
\
OCP\Share
::
SHARE_TYPE_LINK
)
{
if
(
$permissions
===
null
&&
$password
===
null
&&
$publicUpload
===
null
&&
$expireDate
===
null
)
{
if
(
$permissions
===
null
&&
$password
===
null
&&
$publicUpload
===
null
&&
$expireDate
===
null
&&
$name
===
null
)
{
$share
->
getNode
()
->
unlock
(
ILockingProvider
::
LOCK_SHARED
);
return
new
\
OC\OCS\Result
(
null
,
400
,
'Wrong or no update parameter given'
);
}
...
...
@@ -641,7 +644,10 @@ class Share20OCS {
$newPermissions
=
\
OCP\Constants
::
PERMISSION_READ
|
\
OCP\Constants
::
PERMISSION_CREATE
|
\
OCP\Constants
::
PERMISSION_UPDATE
|
\
OCP\Constants
::
PERMISSION_DELETE
;
}
$share
->
setName
(
$name
);
// set name only if passed as parameter, empty string is allowed
if
(
$name
!==
null
)
{
$share
->
setName
(
$name
);
}
if
(
$newPermissions
!==
null
)
{
$share
->
setPermissions
(
$newPermissions
);
...
...
apps/files_sharing/tests/API/Share20OCSTest.php
View file @
7ae19811
...
...
@@ -1942,6 +1942,83 @@ class Share20OCSTest extends TestCase {
$this
->
assertEquals
(
$expected
->
getMeta
(),
$result
->
getMeta
());
$this
->
assertEquals
(
$expected
->
getData
(),
$result
->
getData
());
}
public
function
testUpdateLinkShareNameAlone
()
{
$ocs
=
$this
->
mockFormatShare
();
$date
=
new
\
DateTime
(
'2000-01-01'
);
$folder
=
$this
->
createMock
(
'\OCP\Files\Folder'
);
$share
=
\
OC
::
$server
->
getShareManager
()
->
newShare
();
$share
->
setPermissions
(
\
OCP\Constants
::
PERMISSION_READ
)
->
setSharedBy
(
$this
->
currentUser
->
getUID
())
->
setShareType
(
Share
::
SHARE_TYPE_LINK
)
->
setName
(
'somename'
)
->
setNode
(
$folder
);
$this
->
request
->
method
(
'getParam'
)
->
will
(
$this
->
returnValueMap
([
[
'name'
,
null
,
'another'
],
]));
$this
->
shareManager
->
method
(
'getShareById'
)
->
with
(
'ocinternal:42'
)
->
willReturn
(
$share
);
$this
->
shareManager
->
expects
(
$this
->
once
())
->
method
(
'updateShare'
)
->
with
(
$this
->
callback
(
function
(
\
OCP\Share\IShare
$share
)
use
(
$date
)
{
return
$share
->
getName
()
===
'another'
;
})
)
->
will
(
$this
->
returnArgument
(
0
));
$this
->
shareManager
->
method
(
'getSharedWith'
)
->
willReturn
([]);
$expected
=
new
\
OC\OCS\Result
(
null
);
$result
=
$ocs
->
updateShare
(
42
);
$this
->
assertEquals
(
$expected
->
getMeta
(),
$result
->
getMeta
());
$this
->
assertEquals
(
$expected
->
getData
(),
$result
->
getData
());
}
public
function
testUpdateLinkShareKeepNameWhenNotSpecified
()
{
$ocs
=
$this
->
mockFormatShare
();
$date
=
new
\
DateTime
(
'2000-01-01'
);
$folder
=
$this
->
createMock
(
'\OCP\Files\Folder'
);
$share
=
\
OC
::
$server
->
getShareManager
()
->
newShare
();
$share
->
setPermissions
(
\
OCP\Constants
::
PERMISSION_READ
)
->
setSharedBy
(
$this
->
currentUser
->
getUID
())
->
setShareType
(
Share
::
SHARE_TYPE_LINK
)
->
setName
(
'somename'
)
->
setNode
(
$folder
);
$this
->
request
->
method
(
'getParam'
)
->
will
(
$this
->
returnValueMap
([
[
'password'
,
null
,
'test'
],
]));
$this
->
shareManager
->
method
(
'getShareById'
)
->
with
(
'ocinternal:42'
)
->
willReturn
(
$share
);
$this
->
shareManager
->
expects
(
$this
->
once
())
->
method
(
'updateShare'
)
->
with
(
$this
->
callback
(
function
(
\
OCP\Share\IShare
$share
)
use
(
$date
)
{
return
$share
->
getPermissions
()
===
(
\
OCP\Constants
::
PERMISSION_READ
)
&&
$share
->
getPassword
()
===
'test'
&&
$share
->
getName
()
===
'somename'
;
})
)
->
will
(
$this
->
returnArgument
(
0
));
$this
->
shareManager
->
method
(
'getSharedWith'
)
->
willReturn
([]);
$expected
=
new
\
OC\OCS\Result
(
null
);
$result
=
$ocs
->
updateShare
(
42
);
$this
->
assertEquals
(
$expected
->
getMeta
(),
$result
->
getMeta
());
$this
->
assertEquals
(
$expected
->
getData
(),
$result
->
getData
());
}
public
function
dataFormatShare
()
{
$file
=
$this
->
createMock
(
'\OCP\Files\File'
);
$folder
=
$this
->
createMock
(
'\OCP\Files\Folder'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment