Fallback to user id if owner is not available and set inline csp to f…

…ix issues with android webview Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Jan 16, 2020 · 8284c24 · 8284c24
1 parent 4c6e73b
commit 8284c24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/lib/Controller/StaticController.php b/lib/Controller/StaticController.php
@@ -127,8 +127,8 @@ private function createFileResponse($path) {
 		}
 
 		$csp = new ContentSecurityPolicy();
-		$csp->addAllowedScriptDomain('\'strict-dynamic\'');
 		$csp->addAllowedScriptDomain('\'unsafe-eval\'');
+		$csp->addAllowedScriptDomain('\'unsafe-inline\'');
 		$csp->addAllowedFrameDomain($this->request->getServerHost());
 		$response->setContentSecurityPolicy($csp);
 

diff --git a/lib/OnlyOffice/AutoConfig.php b/lib/OnlyOffice/AutoConfig.php
@@ -79,5 +79,6 @@ private function autoConfig() {
 
 		$this->appConfig->SetDefaultFormats($defaultFormats);
 		$this->appConfig->SetEditableFormats($editFormats);
+		$this->appConfig->SetSameTab(true);
 	}
-}
+}
diff --git a/lib/OnlyOffice/URLDecoder.php b/lib/OnlyOffice/URLDecoder.php
@@ -89,6 +89,8 @@ public function getFileForToken(string $token): ?File {
 				$userId = $this->userSession->getUser()->getUID();
 			} else if (isset($hashData->ownerId)) {
 				$userId = $hashData->ownerId;
+			} else if (isset($hashData->userId)) {
+				$userId = $hashData->userId;
 			} else {
 				throw new \Exception("Can't get owner id from document url");
 			}