Try login with cookies using hidden browser, show browser if failed.

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 6123305..3698666 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -25,6 +25,7 @@
 
 #include <QtDebug>
 #include <QDateTime>
+#include <QNetworkReply>
 #include <QSettings>
 #include <QStringList>
 #include <QVariantMap>
@@ -90,6 +91,16 @@ void FacebookAuthentication::login()
     emit buildLoginBrowser();
 }
 
+void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
+{
+    qWarning() <<__PRETTY_FUNCTION__;
+
+    if (reply->error() != QNetworkReply::NoError) {
+        qCritical() << __PRETTY_FUNCTION__ << "error:" << reply->error() << reply->errorString();
+        /// @todo Emit error signal
+    }
+}
+
 QString FacebookAuthentication::parseSession(const QUrl &url)
 {
     qWarning() << __PRETTY_FUNCTION__;
@@ -124,6 +135,9 @@ void FacebookAuthentication::setBrowser(FacebookLoginBrowser *browser)
         connect(m_browser, SIGNAL(destroyed()),
                 this, SLOT(browserDestroyed()));
 
+        connect(m_browser->page()->networkAccessManager(), SIGNAL(finished(QNetworkReply*)),
+                this, SLOT(networkReplyHandler(QNetworkReply*)));
+
         //    browser->load(QUrl("https://graph.facebook.com/oauth/authorize?client_id=4197c64da2fb6b927236feaea32d7d81&redirect_uri=http://www.facebook.com/connect/login_success.html&display=touch&type=user_agent"));
 
         QString url = "https://www.facebook.com/login.php?";
@@ -145,11 +159,28 @@ void FacebookAuthentication::urlChanged(const QUrl &url)
 {
     qWarning() << __PRETTY_FUNCTION__ << url.toString();
 
-    // if login succeeded
-    if (url.toString().startsWith(REDIRECT_URI)) {
+    /*
+      Redirects:
+        * Login with cookie failed:
+            1) http://m.facebook.com/login.php?api_key=cf77865a5070f2c2ba3b52cbf3371579&cancel_url=http://www.facebook.com/connect/login_failure.html&display=touch&fbconnect=1&next=http://www.facebook.com/connect/uiserver.php?app_id=286811277465&next=http%3A%2F%2Fwww.facebook.com%2Fconnect%2Flogin_success.html&display=touch&cancel_url=http%3A%2F%2Fwww.facebook.com%2Fconnect%2Flogin_failure.html&perms=publish_stream&return_session=1&session_version=3&fbconnect=1&canvas=0&legacy_return=1&method=permissions.request&return_session=1&session_version=3&v=1.0&req_perms=publish_stream&app_id=286811277465&refsrc=http://www.facebook.com/login.php&fbb=ra985c5e9
+
+        * Login with cookie succeeded:
+            1) http://www.facebook.com/connect/uiserver.php?app_id=286811277465&next=http://www.facebook.com/connect/login_success.html&display=touch&cancel_url=http://www.facebook.com/connect/login_failure.html&perms=publish_stream&return_session=1&session_version=3&fbconnect=1&canvas=0&legacy_return=1&method=permissions.request&session={"session_key":"2.iHXi5fLKlHktva2R71xSAw__.3600.1289228400-100001006647973","uid":100001006647973,"expires":1289228400,"secret":"q4_Hn5qRdxnVT_qh3ztv5w__","sig":"c9d29ca857bacec48b952e7d2826a3ca"}&fbb=rb28f24e5
+            2) http://www.facebook.com/connect/login_success.html?perms=publish_stream&selected_profiles=100001006647973&session={"session_key":"2.iHXi5fLKlHktva2R71xSAw__.3600.1289228400-100001006647973","uid":"100001006647973","expires":1289228400,"secret":"q4_Hn5qRdxnVT_qh3ztv5w__","access_token":"286811277465|2.iHXi5fLKlHktva2R71xSAw__.3600.1289228400-100001006647973|LVTHGW82A98SGvv6Fl43DlCrFT0","sig":"8edd8d611047bcd162abbe9983b25a56"}
+     */
+
+    if (!url.toString().contains("session={")) {
+        // url parameter doesn't contain session data, so login with cookies failed
+        qWarning() << __PRETTY_FUNCTION__ << "working credentials required";
+        m_browser->show();
+    } else if (url.toString().startsWith(REDIRECT_URI)) {
+        // login succeeded
         const QString session = parseSession(url);
-        qWarning() << __PRETTY_FUNCTION__ << "parsed session:" << session;
+        qWarning() << __PRETTY_FUNCTION__ << "login finished, parsed session:" << session;
         if (!session.isEmpty())
             emit loggedIn(session);
     }
+    else {
+        qWarning() << __PRETTY_FUNCTION__ << "credentials accepted, getting the access_token";
+    }
 }

diff --git a/src/facebookservice/facebookauthentication.h b/src/facebookservice/facebookauthentication.h
index 0d3cbfa..5c13c87 100644 (file)
--- a/src/facebookservice/facebookauthentication.h
+++ b/src/facebookservice/facebookauthentication.h
@@ -26,6 +26,8 @@
 
 #include <QUrl>
 
+class QNetworkReply;
+
 class FacebookLoginBrowser;
 
 /**
@@ -74,6 +76,8 @@ private slots:
 
     void loadFinished(bool ok);
 
+    void networkReplyHandler(QNetworkReply *reply);
+
     void urlChanged(const QUrl &url);
 
 /*******************************************************************************

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 8380571..12bf868 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -171,8 +171,6 @@ void MainWindow::buildFacebookLoginBrowser()
     if (!m_facebookLoginBrowser)
         m_facebookLoginBrowser = new FacebookLoginBrowser(this);
 
-    m_facebookLoginBrowser->show();
-
     emit loginBrowserCreated(m_facebookLoginBrowser);
 }