Implemented closeAuthenticationDialog

5 files changed, 38 insertions, 4 deletions

diff --git a/browser/networkmanager.cpp b/browser/networkmanager.cpp
index 10c6712..57c853b 100644
--- a/browser/networkmanager.cpp
+++ b/browser/networkmanager.cpp
@@ -44,8 +44,12 @@ void networkmanager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticat
     connect (this, SIGNAL(doCloseAuthenticationDialog(bool, const conn::brw::AuthenticationData)), this, SLOT(authenticate(bool, const conn::brw::AuthenticationData)));
     connect (this, SIGNAL(doCloseAuthenticationDialog(bool, const conn::brw::AuthenticationData)), &loop, SLOT(quit()));
     loop.exec();
-    qDebug() << "Authentication provided";
+    qDebug() << "Authentication provided: user" << m_authData.strUserName << "password:" << m_authData.strPassword;
 
-    authenticator->setUser(m_authData.strUserName);
-    authenticator->setPassword(m_authData.strPassword);
+    if (m_authBool) {
+        authenticator->setUser(m_authData.strUserName);
+        authenticator->setPassword(m_authData.strPassword);
+    } else {
+        qDebug() << "Action was cancelled";
+    }
 }
diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.cpp b/browser/unit-tests/browserdbus/testbrowserdbus.cpp
index afda8aa..0380755 100644
--- a/browser/unit-tests/browserdbus/testbrowserdbus.cpp
+++ b/browser/unit-tests/browserdbus/testbrowserdbus.cpp
@@ -336,6 +336,19 @@ void TestBrowserDBus::testGetsNotifiedOnAuthDialog() {
     QSignalSpy spy (m_bdb, SIGNAL(onAuthenticationDialog(const conn::brw::AuthenticationData&)));
     m_bdb->createPageWindow(1,0,0,800,600);
     m_bdb->loadurl("http://www.httpwatch.com/httpgallery/authentication/authenticatedimage/default.aspx");
-    QVERIFY(spy.wait(5000));
+    QVERIFY(spy.wait(1000));
+}
+
+void TestBrowserDBus::testCanCloseAuthDialog() {
+    QSignalSpy spy (m_bdb, SIGNAL(onAuthenticationDialog(const conn::brw::AuthenticationData&)));
+    m_bdb->createPageWindow(1,0,0,800,600);
+    m_bdb->loadurl("http://www.httpwatch.com/httpgallery/authentication/authenticatedimage/default.aspx");
+    QVERIFY(spy.wait(1000));
+
+    conn::brw::AuthenticationData d;
+    d.strUserName = "httpwatch";
+    d.strPassword = QString(qrand());
+    qDebug() << ": user" << d.strUserName << "password:" << d.strPassword;
+    m_bdb->closeAuthenticationDialog(conn::brw::DR_OK, d);
 }
 QTEST_MAIN (TestBrowserDBus);
diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.h b/browser/unit-tests/browserdbus/testbrowserdbus.h
index 5dc4edc..0721653 100644
--- a/browser/unit-tests/browserdbus/testbrowserdbus.h
+++ b/browser/unit-tests/browserdbus/testbrowserdbus.h
@@ -50,6 +50,7 @@ private slots:
     void testGetPrevEnteredValues();
     void testGetsNotifiedWhenSelectIsSelected();
     void testGetsNotifiedOnAuthDialog();
+    void testCanCloseAuthDialog();
 
 private:
     QString testFileUrl() {
diff --git a/common/browserdbus.cpp b/common/browserdbus.cpp
index 45f11dd..1cdca89 100644
--- a/common/browserdbus.cpp
+++ b/common/browserdbus.cpp
@@ -745,3 +745,18 @@ QStringList BrowserDbus::getPrevEnteredValues(QString name, QString value, conn:
     }
     return list;
 }
+
+void BrowserDbus::closeAuthenticationDialog(conn::brw::DIALOG_RESULT r, const conn::brw::AuthenticationData& d)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    QStringList list;
+
+    QDBusReply<conn::brw::ERROR_IDS> reply = networkmanager->closeAuthenticationDialog(r,d);
+    if(reply.isValid()) {
+        conn::brw::ERROR_IDS ret = reply.value();
+        qDebug() << "ERROR_IDS " << ret;
+    } else {
+        QDBusError error = reply.error();
+        qDebug() << "ERROR " << error.name() << error.message();
+    }
+}
diff --git a/common/browserdbus.h b/common/browserdbus.h
index 155981d..dc50157 100644
--- a/common/browserdbus.h
+++ b/common/browserdbus.h
@@ -77,6 +77,7 @@ public:
     Q_INVOKABLE void closeConfirmDialog(conn::brw::DIALOG_RESULT);
     Q_INVOKABLE void closePromptDialog(QString, conn::brw::DIALOG_RESULT);
     Q_INVOKABLE QStringList getPrevEnteredValues(QString name, QString value, conn::brw::INPUT_ELEMENT_TYPE type);
+    Q_INVOKABLE void closeAuthenticationDialog(conn::brw::DIALOG_RESULT, const conn::brw::AuthenticationData&);
 
 
     QString title() { return m_title; }