Merge pull request #10459 from nextcloud/bugfix/ReAuthDialog

fix(wizard): align reauthentication with account setup

Author: Rello

resources.qrc

@@ -63,7 +63,9 @@
         <file>src/gui/wizard/qml/AccountWizardWindow.qml</file>
         <file>src/gui/wizard/qml/AdvancedOptionsDialog.qml</file>
         <file>src/gui/wizard/qml/BasicAuthPage.qml</file>
+        <file>src/gui/wizard/qml/BrowserAuthFooter.qml</file>
         <file>src/gui/wizard/qml/BrowserAuthPage.qml</file>
+        <file>src/gui/wizard/qml/BrowserReAuthWindow.qml</file>
         <file>src/gui/wizard/qml/ClientCertificateDialog.qml</file>
         <file>src/gui/wizard/qml/OptionRow.qml</file>
         <file>src/gui/wizard/qml/ProxySettingsDialog.qml</file>

src/3rdparty/QProgressIndicator/QProgressIndicator.cpp

@@ -53,7 +53,6 @@ set(client_UI_SRCS
     proxyauthdialog.ui
     mnemonicdialog.ui
     vfsdownloaderrordialog.ui
-    wizard/flow2authwidget.ui
 )
 
 qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
@@ -259,16 +258,12 @@ set(client_SRCS
     creds/flow2auth.cpp
     creds/webflowcredentials.h
     creds/webflowcredentials.cpp
-    creds/webflowcredentialsdialog.h
-    creds/webflowcredentialsdialog.cpp
     wizard/accountwizardcontroller.h
     wizard/accountwizardcontroller.cpp
-    wizard/flow2authwidget.h
-    wizard/flow2authwidget.cpp
-    wizard/providersignuppage.h
-    wizard/providersignuppage.cpp
-    wizard/linklabel.h
-    wizard/linklabel.cpp
+    wizard/browserreauthcontroller.h
+    wizard/browserreauthcontroller.cpp
+    wizard/browserreauthwindow.h
+    wizard/browserreauthwindow.cpp
     integration/fileactionsmodel.h
     integration/fileactionsmodel.cpp
     )
@@ -424,8 +419,6 @@ IF( APPLE )
 ENDIF()
 
 set(3rdparty_SRC
-    ../3rdparty/QProgressIndicator/QProgressIndicator.h
-    ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
     ../3rdparty/kmessagewidget/kmessagewidget.h
     ../3rdparty/kmessagewidget/kmessagewidget.cpp
     ../3rdparty/kirigami/wheelhandler.h
@@ -625,7 +618,6 @@ set_target_properties(nextcloudCore
 
 target_include_directories(nextcloudCore
   PUBLIC
-  ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
   ${CMAKE_SOURCE_DIR}/src/3rdparty/kirigami
   ${CMAKE_SOURCE_DIR}/src/3rdparty/kmessagewidget
   ${CMAKE_CURRENT_BINARY_DIR}

src/3rdparty/QProgressIndicator/QProgressIndicator.h

@@ -11,6 +11,8 @@ import Style
 ApplicationWindow {
     id: root
 
+    property bool minimizable: false
+
     LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
@@ -19,6 +21,7 @@ ApplicationWindow {
         | Qt.WindowTitleHint
         | Qt.WindowSystemMenuHint
         | Qt.WindowCloseButtonHint
+        | (root.minimizable ? Qt.WindowMinimizeButtonHint : 0)
     color: Style.wizardWindowBackground
     palette.window: Style.wizardWindowBackground
     palette.base: Style.wizardFieldBackground

src/3rdparty/QProgressIndicator/README.md

@@ -11,17 +11,14 @@
 #include "account.h"
 #include "configfile.h"
 #include "theme.h"
-#include "webflowcredentialsdialog.h"
+#include "wizard/browserreauthwindow.h"
 #include "networkjobs.h"
 
 #include <QAuthenticator>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPointer>
 #include <QTimer>
-#include <QDialog>
-#include <QVBoxLayout>
-#include <QLabel>
 
 using namespace QKeychain;
 
@@ -145,22 +142,31 @@ void WebFlowCredentials::fetchFromKeychain(const QString &appName) {
 }
 
 void WebFlowCredentials::askFromUser() {
-    _askDialog = new WebFlowCredentialsDialog(_account);
+    if (_reAuthWindow) {
+        _reAuthWindow->show();
+        return;
+    }
+
+    _reAuthWindow = new BrowserReAuthWindow(_account, this);
 
     QString msg = tr("You have been logged out of your account %1 at %2. Please login again.")
                       .arg(_account->prettyName(), _account->url().toDisplayString());
-    _askDialog->setInfo(msg);
+    _reAuthWindow->setInfoText(msg);
 
-    _askDialog->show();
+    connect(_reAuthWindow, &BrowserReAuthWindow::credentialsReady, this, &WebFlowCredentials::slotAskFromUserCredentialsProvided);
+    connect(_reAuthWindow, &BrowserReAuthWindow::cancelled, this, &WebFlowCredentials::slotAskFromUserCancelled);
 
-    connect(_askDialog, &WebFlowCredentialsDialog::urlCatched, this, &WebFlowCredentials::slotAskFromUserCredentialsProvided);
-    connect(_askDialog, &WebFlowCredentialsDialog::onClose, this, &WebFlowCredentials::slotAskFromUserCancelled);
+    _reAuthWindow->show();
 
     qCDebug(lcWebFlowCredentials()) << "User needs to reauth!";
 }
 
-void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user, const QString &pass, const QString &host) {
-    Q_UNUSED(host)
+void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user, const QString &pass) {
+    auto *const reAuthWindow = qobject_cast<BrowserReAuthWindow *>(sender());
+    if (!reAuthWindow || reAuthWindow != _reAuthWindow) {
+        return;
+    }
+    _reAuthWindow = nullptr;
 
     qCInfo(lcWebFlowCredentials()) << "Obtained a new password";
 
@@ -170,18 +176,18 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user,
     _credentialsValid = true;
     persist();
     emit asked();
-
-    _askDialog->close();
-    _askDialog = nullptr;
 }
 
 void WebFlowCredentials::slotAskFromUserCancelled() {
+    auto *const reAuthWindow = qobject_cast<BrowserReAuthWindow *>(sender());
+    if (!reAuthWindow || reAuthWindow != _reAuthWindow) {
+        return;
+    }
+    _reAuthWindow = nullptr;
+
     qCDebug(lcWebFlowCredentials()) << "User cancelled reauth!";
 
     emit asked();
-
-    _askDialog->deleteLater();
-    _askDialog = nullptr;
 }
 
 bool WebFlowCredentials::stillValid(QNetworkReply *reply) {