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.

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

[stable-3.16] improve ToS handling #7895

Merged
merged 8 commits into from
Feb 20, 2025
Merged

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Feb 20, 2025

Backport of #7856

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

mgallien and others added 2 commits February 20, 2025 10:35
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
@backportbot backportbot bot requested review from mgallien and nilsding February 20, 2025 10:35
@backportbot backportbot bot added this to the 3.16.0 milestone Feb 20, 2025
@mgallien mgallien marked this pull request as ready for review February 20, 2025 10:52
mgallien and others added 5 commits February 20, 2025 12:00
should avoid being blocked by terms_of_service blocking WebDAV access

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
should enable proper polling while the user check and signs the terms of
service via teh web browser

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
this is only shown if the TOS haven't been accepted yet!

for now this only opens the browser, similar to the Flow2Auth page

the `TermsOfServiceCheckWidget` is a combination of the `Flow2Auth` and
the `Flow2AuthWidget` classes -- in the future we ideally display the
required TOS directly in the wizard

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
@mgallien mgallien force-pushed the backport/7856/stable-3.16 branch from b4bb41c to 072cd51 Compare February 20, 2025 11:01
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
@mgallien mgallien force-pushed the backport/7856/stable-3.16 branch from 072cd51 to 85715ef Compare February 20, 2025 11:01
@mgallien mgallien enabled auto-merge February 20, 2025 11:01
Copy link

Artifact containing the AppImage: nextcloud-appimage-pr-7895.zip

SHA256 checksum: 6ec1c9f510a8d7086940e40ac2dbbd3411ae6a1fce1d2c394e73b06f721e19a0

To test this change/fix you can download the above artifact file, unzip it, and run it.

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

@mgallien mgallien merged commit cfd1b98 into stable-3.16 Feb 20, 2025
12 of 14 checks passed
@mgallien mgallien deleted the backport/7856/stable-3.16 branch February 20, 2025 11:10
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
0.5% Coverage on New Code (required ≥ 80%)
30 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants