Skip to content

Scope the appdata theming storage for global and users - #34599

Merged
PVince81 merged 5 commits into
masterfrom
fix/background-appdata-scrope
Oct 14, 2022
Merged

Scope the appdata theming storage for global and users#34599
PVince81 merged 5 commits into
masterfrom
fix/background-appdata-scrope

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Oct 14, 2022

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added this to the Nextcloud 26 milestone Oct 14, 2022
@skjnldsvskjnldsv self-assigned this Oct 14, 2022
@skjnldsv
skjnldsvforce-pushed the fix/background-appdata-scrope branch from 2aca8e0 to 11173a9CompareOctober 14, 2022 09:20
This was referenced Oct 14, 2022
Closed
Closed
@PVince81

PVince81 commented Oct 14, 2022•
edited
Loading

Copy link
Copy Markdown
Member
  • add hash to the "v=" argument based on user id to avoid seeing another user's background
  • still need shift+refresh for seeing the updated background because the browser is using the old version:

here we should see "v=2" but we see "v=1":
image

this is likely because "apps.scss" is also a cached asset, we need to add a cache buster there as well
it might have worked before when busting the global theme cache as it would force a reload of those files, but busting the global theme is a no-go as it has side effects

PVince81
PVince81 approved these changes Oct 14, 2022
View reviewed changes

@PVince81PVince81 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for @skjnldsv's part, please also review what I pushed

@PVince81

PVince81 commented Oct 14, 2022

Copy link
Copy Markdown
Member

I've pushed a fix that adds cache busting also for the CSS variables to make sure we load the correct background in apps.
Additionally I've hashed the user id there to make sure we don't see the cached background of another user.
This fixes #34599 (comment)

szaimen
szaimen reviewed Oct 14, 2022
View reviewed changes
Comment threadapps/theming/lib/Themes/DefaultTheme.php
github-advanced-security[bot]
github-advanced-securityAI found potential problems Oct 14, 2022
View reviewed changes
Comment threadapps/theming/lib/Service/ThemeInjectionService.php
$this->defaultTheme = $defaultTheme;
$this->config = $config;
if ($userSession->getUser() !== null) {
$this->userId = $userSession->getUser()->getUID();

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getUID on possibly null value
@skjnldsv
skjnldsv requested review from a team, ArtificialOwl, blizzz, juliusknorr and szaimen and removed request for a teamOctober 14, 2022 11:44
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 14, 2022
@szaimen

This comment was marked as resolved.

Sign in to view
@skjnldsv

This comment was marked as resolved.

Sign in to view
szaimen
szaimen requested changes Oct 14, 2022
View reviewed changes

@szaimenszaimen left a comment •
edited by skjnldsv
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See

2022-10-14-134652.mp4

@szaimen

This comment was marked as off-topic.

Sign in to view
@szaimen

This comment was marked as off-topic.

Sign in to view
@PVince81

This comment was marked as resolved.

Sign in to view
@PVince81

This comment was marked as resolved.

Sign in to view
@skjnldsv

This comment was marked as resolved.

Sign in to view
@skjnldsv
skjnldsvforce-pushed the fix/background-appdata-scrope branch from 8a5b526 to acc7a2cCompareOctober 14, 2022 12:14
@skjnldsv
skjnldsv requested a review from szaimenOctober 14, 2022 12:14
szaimen
szaimen approved these changes Oct 14, 2022
View reviewed changes

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works but didn't review the code

@PVince81

PVince81 commented Oct 14, 2022

Copy link
Copy Markdown
Member

I've retested admin vs user background and no more shift+refresh is needed, it works smoothly and as expected.
Likewise, the public page had the background configured by the admin

Shipit!

@PVince81PVince81 mentioned this pull request Oct 14, 2022
Closed
1 task
@PVince81

PVince81 commented Oct 14, 2022

Copy link
Copy Markdown
Member

I've raised the lower priority #34606 to clean up the old theme cache data since we now moved everything into "appdata*/theming/global/"

@PVince81PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 14, 2022
@PVince81PVince81 mentioned this pull request Oct 14, 2022
Closed
9 tasks
@PVince81

PVince81 commented Oct 14, 2022

Copy link
Copy Markdown
Member

/rebase

skjnldsvand others added 5 commits October 14, 2022 16:18
@skjnldsv@PVince81
Scope the appdata theming storage for global and users
e4ff84d
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsv@PVince81
Properly use user background cachebuster
a8e90a0
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsv@PVince81
Fix migration
ac21c63
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsv@PVince81
Fix tests
d77e832
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@PVince81
Improve cache buster for user backgrounds
19f35f4
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81
PVince81force-pushed the fix/background-appdata-scrope branch from acc7a2c to 19f35f4CompareOctober 14, 2022 14:18
@PVince81PVince81 mentioned this pull request Oct 14, 2022
Merged
@PVince81

PVince81 commented Oct 14, 2022

Copy link
Copy Markdown
Member

rebased for CI

and manual backport to save some time... #34612

@blizzz

blizzz commented Oct 14, 2022

Copy link
Copy Markdown
Member

backgroundVersion is not used anymore, but still migrated in core/Migrations/Version25000Date20221007010957.php. Can be cleaned up afterwards though, just not to forget it.

@PVince81
PVince81 merged commit 2b87aeb into masterOct 14, 2022
@PVince81
PVince81 deleted the fix/background-appdata-scrope branch October 14, 2022 15:54
@PVince81PVince81 mentioned this pull request Jan 19, 2023
Closed
9 tasks
@icewind1991icewind1991 mentioned this pull request May 15, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81PVince81PVince81 approved these changes
@szaimenszaimenszaimen approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwl
@blizzzblizzzAwaiting requested review from blizzz
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbughighregression

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

[Bug] [25.0.0RC4] Custom background doesn't stay (404)

5 participants

@skjnldsv@PVince81@szaimen@blizzz@github-advanced-security