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

GUI/LIBSYNC: force login flow V2 with config setting #6261

Merged
merged 3 commits into from
Jan 19, 2024

Conversation

mickenordin
Copy link
Contributor

This patch allows a user to set the config variable:

forceLoginV2=true

This will make the client use the browser login flow instead of the webview. This is useful for making the user experience equal on Windows, Linux and Mac. Currently only Macs use the v2 flow and it was only possible to get this behaviour in the Windows and Linux clients at build time using a CMAKE flag.

The default behaviour is kept the same, and nothing changes for the user unless the flag is manually set in the config file. A setter is included in this patch, although it is not yet used in the GUI.

Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Lots of little formatting changes requested but otherwise looks good!

src/gui/wizard/owncloudsetuppage.cpp Outdated Show resolved Hide resolved
src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Thanks for the changes!

Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

I just noticed, coud you remove the merge commits in this PR? After that we can merge :)

@mickenordin
Copy link
Contributor Author

mickenordin commented Dec 7, 2023

I just noticed, coud you remove the merge commits in this PR? After that we can merge :)

Is that how you want it? I did git rebase -i 369296d6ed33989fa8380e594424de2fa3b564bb
@claucambra Now I think the history is good :)

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6261-49b6a3a13d2a82b342dbdc00d0094375a6937a43-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
Copy link
Collaborator

I just noticed, coud you remove the merge commits in this PR? After that we can merge :)

Is that how you want it? I did git rebase -i 369296d6ed33989fa8380e594424de2fa3b564bb @claucambra Now I think the history is good :)

Indeed, looks good!

@mickenordin
Copy link
Contributor Author

Seems some required tests are failing for unrelated reasons, can they be restarted @claucambra ?

@mgallien
Copy link
Collaborator

@mickenordin I am confused on the state of the PR as visible in the github web UI
could you rebase it on top of latest master and I try to merge it ?
I have no idea why no tests ran and do not see a button to rebase myself
I would have expected some explanations from github web UI

@mickenordin
Copy link
Contributor Author

mickenordin commented Jan 19, 2024

@mickenordin I am confused on the state of the PR as visible in the github web UI could you rebase it on top of latest master and I try to merge it ? I have no idea why no tests ran and do not see a button to rebase myself I would have expected some explanations from github web UI

Done! It should be ready to merge as far as I know.

@mgallien
Copy link
Collaborator

so this time I had the button to enable the run of checks
I will keep an eye
thanks for the rebase

@mgallien
Copy link
Collaborator

@mickenordin you did a merge of master instead of a rebase
please remove the merge commit ?

@mickenordin
Copy link
Contributor Author

I hate computers... I'll see if I can clean up this mess.

mickenordin and others added 3 commits January 19, 2024 11:03
This patch allows a user to set the config variable:

forceLoginV2=true

This will make the client use the browser login flow instead of the
webview. This is useful for making the user experience equal on
Windows, Linux and Mac. Currently only Macs use the v2 flow and it
was only possible to get this behaviour in the Windows and Linux
clients at build time using a CMAKE flag.

The default behaviour is kept the same, and nothing changes for the
user unless the flag is manually set in the config file. A setter is
included in this patch, although it is not yet used in the GUI.

Signed-off-by: Micke Nordin <[email protected]>
Formatting fixes

Co-authored-by: Claudio Cambra <[email protected]>
Signed-off-by: Micke Nordin <[email protected]>
@mickenordin
Copy link
Contributor Author

Ok @mgallien , how is that?

@mgallien
Copy link
Collaborator

@mickenordin perfectly fine
thanks for the work
I approved the run of the tests (except drone that is disabled #6363)

@mgallien mgallien merged commit 97ac36e into nextcloud:master Jan 19, 2024
6 of 9 checks passed
@mgallien mgallien added this to the 3.12.0 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants