Commit bc3c835f authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #12390 from owncloud/use-session-in-case

Close session only if encryption app is not enabled
parents 53b2d857 85890795
......@@ -84,7 +84,6 @@ class ShareController extends Controller {
* @NoCSRFRequired
*
* @param string $token
*
* @return TemplateResponse|RedirectResponse
*/
public function showAuthenticate($token) {
......@@ -127,7 +126,6 @@ class ShareController extends Controller {
*
* @param string $token
* @param string $path
*
* @return TemplateResponse
*/
public function showShare($token, $path = '') {
......@@ -207,6 +205,8 @@ class ShareController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
* @UseSession
*
* @param string $token
* @param string $files
* @param string $path
......@@ -215,6 +215,12 @@ class ShareController extends Controller {
public function downloadShare($token, $files = null, $path = '') {
\OC_User::setIncognitoMode(true);
// FIXME: Use DI once there is a suitable class
if (!\OCP\App::isEnabled('files_encryption')) {
// encryption app requires the session to store the keys in
\OC::$server->getSession()->close();
}
$linkItem = OCP\Share::getShareByToken($token, false);
// Share is password protected - check whether the user is permitted to access the share
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment