Skip to content
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

Jump to bottom

Fix account migration from legacy desktop clients (again) #5640

Merged
merged 12 commits into from
May 8, 2023
Merged

Fix account migration from legacy desktop clients (again) #5640

merged 12 commits into from
May 8, 2023

Conversation

claucambra
Copy link
Collaborator

The two key fixes in this PR are:

  1. Making folder migration procedures accept absolute file paths instead of relative file paths, allowing the migration steps to migrate config files from clients under old names
  2. Migrating accounts with "dummy" authtype that are technically webflow users

This PR also cleans up a bunch of really old and unnecessarily difficult to read code

@claucambra claucambra self-assigned this Apr 30, 2023
@codecov
Copy link

codecov bot commented Apr 30, 2023 •
edited
Loading

Codecov Report

Merging #5640 (0ee8500) into master (a7eefe8) will decrease coverage by 0.17%.
The diff coverage is 22.22%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #5640      +/-   ##
==========================================
- Coverage   59.39%   59.23%   -0.17%     
==========================================
  Files         143      143              
  Lines       18450    18458       +8     
==========================================
- Hits        10959    10934      -25     
- Misses       7491     7524      +33
Impacted Files Coverage Δ
src/libsync/configfile.cpp 26.01% <22.22%> (-0.18%) ⬇️

... and 6 files with indirect coverage changes

@claucambra
Copy link
Collaborator Author

/backport to stable-3.8

claucambra added 12 commits May 8, 2023 22:56
@claucambra
Make folder migration in FolderMan::setupFolders() less unreadable, c…
170a6c8 
…onstify

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use const auto, rename unreadable variable names in FolderMan::setupF…
e60e1ec 
…oldersMigration

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Modernise code in FolderMan::backwardMigrationSettingsKeys
c2da86c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Modernise FolderMan::setupFoldersHelper, get rid of more single-lette…
7f46084 
…r variables

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clean up pointer declaration and use in FolderMan::unescapeAlias
e564039 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Restore a specific enum from AccountsManager::restore rather than vag…
bdc0ebd 
…ue boolean

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove unused private static members of ConfigFile
e128e32 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add static discoveredLegacyConfigPath member to configfile
be4b806 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make variables in folderman::setupfoldermigration actually match what…
6cd68b8 
… they are holding

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Set discovered legacy config file path during account migration
081871d 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use canonical file paths rather than problematic relative config file…
bab20a3 
… paths during folder migration in FolderMan

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Correctly migrate accounts that have possible webflow but not correct…
0ee8500 
… authtype in settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the bugfix/folder-migration-from-old branch from 25760d6 to 0ee8500 Compare May 8, 2023 14:56
@sonarcloud
Copy link

sonarcloud bot commented May 8, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 7 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5640-0ee850009b2cf4daace61183a441929801ea9dcc-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra merged commit 650b3e1 into master May 8, 2023
@claucambra claucambra deleted the bugfix/folder-migration-from-old branch May 8, 2023 15:40
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request May 8, 2023
Merged
@mgallien mgallien added this to the 3.9.0 milestone May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@camilasan camilasan camilasan approved these changes

@mgallien mgallien Awaiting requested review from mgallien

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.9.0
Development

Successfully merging this pull request may close these issues.
5 participants
@claucambra @nextcloud-desktop-bot @camilasan @allexzander @mgallien