Skip to content

[stable27] Version support and iframe refactoring #3172

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
juliusknorr merged 12 commits into from
Sep 13, 2023
Merged

[stable27] Version support and iframe refactoring #3172

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c236331
chore: refactor iframes to load collabora directly
juliusknorr Jun 11, 2023
2119b32
tests(cypress): Avoid wrapped iframe
juliusknorr Aug 31, 2023
ccfbd19
fix: Do not reuse query builder
juliusknorr Aug 31, 2023
a229219
ci(cypress): Avoid failing on upstream console errors
juliusknorr Aug 31, 2023
d3f4b3f
test(cypress): Cover some postmessage integrations with cypress tests
juliusknorr Aug 31, 2023
06e54d8
fix: Cleanup
juliusknorr Aug 31, 2023
933e2eb
chore: Fix psalm
juliusknorr Sep 8, 2023
00b0813
chore(CSP): Remove deprecated inline js CSP
juliusknorr Jun 2, 2023
13a33c0
chore: Cleanup merge issues
juliusknorr Sep 8, 2023
497a1cd
ci: Adapt cypress tests for 27
juliusknorr Sep 9, 2023
9ae189f
fix: Use userId as a fallback for new file creation token
juliusknorr Sep 9, 2023
2f5e3dd
ci: Pin oci tests to github runners
juliusknorr Sep 11, 2023
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
Prev Previous commit
Next Next commit
fix: Use userId as a fallback for new file creation token 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Sep 11, 2023
commit 9ae189fbac234b5f69c35d99f7d39b517414bc8c
2 changes: 1 addition & 1 deletion lib/Controller/DocumentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ private function getToken(File $file, ?IShare $share = null, int $version = null
// Pass through $version
$templateFile = $this->templateManager->getTemplateSource($file->getId());
if ($templateFile) {
return $this->tokenManager->generateWopiTokenForTemplate($templateFile, $share?->getShareOwner(), $file->getId());
return $this->tokenManager->generateWopiTokenForTemplate($templateFile, $share?->getShareOwner() ?? $this->userId, $file->getId());
}

return $this->tokenManager->generateWopiToken($this->getWopiFileId($file->getId(), $version), $share?->getToken(), $this->userId);
Expand Down