Skip to content

Use consistent url for the preview with the activity app #31346

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

Closed
CarlSchwan wants to merge 2 commits into from
Closed

Use consistent url for the preview with the activity app #31346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21fb22
Use consistent url for the preview with the activity app
CarlSchwan Feb 24, 2022
5d82106
Don't sort router parameter for caching purpose
CarlSchwan Apr 19, 2022
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
35 changes: 31 additions & 4 deletions apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2381,12 +2381,39 @@
*/
urlSpec.a = this._filesConfig.get('cropimagepreviews') ? 0 : 1;

// Use map to get consistent parameter ordering with activity app generated URl (php)
const urlSpecMap = new Map()
urlSpecMap.set('forceIcon', urlSpec.forceIcon)
urlSpecMap.set('a', urlSpec.a)
urlSpecMap.set('x', urlSpec.x)
urlSpecMap.set('y', urlSpec.y)

if (urlSpec.mode) {
urlSpecMap.set('mode', urlSpec.mode)
}

if (typeof urlSpec.fileId !== 'undefined') {
delete urlSpec.file;
return OC.generateUrl('/core/preview?') + $.param(urlSpec);
urlSpecMap.set('fileId', urlSpec.fileId)
urlSpecMap.set('c', urlSpec.c)

let param = []
urlSpecMap.forEach((value, key) => {
param.push(encodeURIComponent(key) + '=' + encodeURIComponent(value))
})
param = param.join('&')

return window.location.protocol + '//' + window.location.hostname + OC.generateUrl('/core/preview?') + param
} else {
delete urlSpec.fileId;
return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
urlSpecMap.set('file', urlSpec.file)
urlSpecMap.set('c', urlSpec.c)

let param = []
urlSpecMap.forEach((key, value) => {
param.push(encodeURIComponent(key) + '=' + encodeURIComponent(value))
})
param = param.join('&')

return window.location.protocol + '//' + window.location.hostname + OC.generateUrl('/core/preview.png?') + param
}

},
Expand Down
5 changes: 3 additions & 2 deletions lib/private/Route/CachingRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ public function __construct($cache, LoggerInterface $logger) {
* @return string
*/
public function generate($name, $parameters = [], $absolute = false) {
asort($parameters);
$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
$sortedParameters = $parameters;
asort($sortedParameters);
$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($sortedParameters)) . (int)$absolute;
$cachedKey = $this->cache->get($key);
if ($cachedKey) {
return $cachedKey;
Expand Down