Cleaning out old login code ongoing

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 9e21ea7..5525ca6 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -29,7 +29,9 @@
 
 #include "application.h"
 #include "common.h"
+#include "contactmanager.h"
 #include "../error.h"
+#include "ui/facebookloginbrowser.h"
 #include "facebookservice/facebookauthentication.h"
 #include "gps/gpsposition.h"
 #include "map/mapengine.h"
@@ -125,13 +127,19 @@ SituareEngine::SituareEngine()
     m_mapEngine->init();
     m_ui->show();
 
-    m_facebookAuthenticator->start();
+//    m_facebookAuthenticator->start();
 
     m_gps->setMode(GPSPosition::Default);
     initializeGpsAndAutocentering();
 
     m_mce = new MCE(this);
     connect(m_mce, SIGNAL(displayOff(bool)), this, SLOT(setPowerSaving(bool)));
+
+    m_contactManager = new ContactManager(this);
+    m_contactManager->requestContactGuids();
+
+    ///< @todo just for testing the login browser
+    login();
 }
 
 SituareEngine::~SituareEngine()
@@ -300,13 +308,6 @@ void SituareEngine::error(const int context, const int error)
     }
 }
 
-void SituareEngine::fetchUsernameFromSettings()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_ui->setUsername(m_facebookAuthenticator->loadUsername());
-}
-
 void SituareEngine::imageReady(User *user)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -357,6 +358,43 @@ void SituareEngine::locationSearch(QString location)
         m_geocodingService->requestLocation(location);
 }
 
+void SituareEngine::login()
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    FacebookLoginBrowser *browser = m_ui->buildFacebookLoginBrowser();
+
+    connect(browser, SIGNAL(loadFinished(bool)),
+            m_facebookAuthenticator, SLOT(loadFinished(bool)));
+
+    connect(browser, SIGNAL(urlChanged(QUrl)),
+            m_facebookAuthenticator, SLOT(urlChanged(QUrl)));
+
+//    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?";
+    url.append("api_key=cf77865a5070f2c2ba3b52cbf3371579&"); ///< @todo hard coded test server api key
+    url.append("cancel_url=http://www.facebook.com/connect/login_failure.html&");
+    url.append("display=touch&");
+    url.append("fbconnect=1&");
+    url.append("next=http://www.facebook.com/connect/login_success.html&");
+    url.append("return_session=1&");
+    url.append("session_version=3&");
+    url.append("v=1.0&");
+    url.append("req_perms=publish_stream");
+
+    browser->load(QUrl(url));
+}
+
+void SituareEngine::loggedIn()
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    m_ui->destroyFacebookLoginBrowser();
+
+    loginOk();
+}
+
 void SituareEngine::loginActionPressed()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -366,7 +404,7 @@ void SituareEngine::loginActionPressed()
             logout();
             m_situareService->clearUserData();
         } else {
-            m_facebookAuthenticator->start();
+            login();
         }
     }
     else {
@@ -567,6 +605,19 @@ void SituareEngine::setPowerSaving(bool enabled)
         m_mapEngine->setAutoCentering(!enabled);
 }
 
+void SituareEngine::showContactDialog(const QString &facebookId)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QString guid = m_contactManager->contactGuid(facebookId);
+
+    if (!guid.isEmpty())
+        m_ui->showContactDialog(guid);
+    else
+        m_ui->buildInformationBox(tr("Unable to find contact.\nAdd Facebook IM "
+                                     "account from Conversations to use this feature."), true);
+}
+
 void SituareEngine::signalsFromFacebookAuthenticator()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -588,6 +639,12 @@ void SituareEngine::signalsFromFacebookAuthenticator()
 
     connect(m_facebookAuthenticator, SIGNAL(loginUsingCookies()),
             m_ui, SLOT(loginUsingCookies()));
+
+    connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+            m_situareService, SLOT(updateAccessToken(QString)));
+
+    connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+            this, SLOT(loggedIn()));
 }
 
 void SituareEngine::signalsFromGeocodingService()
@@ -685,6 +742,9 @@ void SituareEngine::signalsFromMainWindow()
             m_mapEngine,
             SLOT(showMapArea(const GeoCoordinate&, const GeoCoordinate&)));
 
+    connect(m_ui, SIGNAL(searchHistoryItemClicked(QString)),
+            this, SLOT(locationSearch(QString)));
+
     // signals from routing tab
     connect(m_ui, SIGNAL(clearRoute()),
             m_mapEngine, SLOT(clearRoute()));
@@ -702,6 +762,10 @@ void SituareEngine::signalsFromMainWindow()
     // signal from search location dialog
     connect(m_ui, SIGNAL(searchForLocation(QString)),
             this, SLOT(locationSearch(QString)));
+
+    // signal from friend list panel
+    connect(m_ui, SIGNAL(requestContactDialog(const QString &)),
+            this, SLOT(showContactDialog(const QString &)));
 }
 
 void SituareEngine::signalsFromMapEngine()
@@ -806,7 +870,6 @@ void SituareEngine::userDataChanged(User *user, QList<User *> &friendsList)
     qDebug() << __PRETTY_FUNCTION__;
 
     m_ui->toggleProgressIndicator(false);
-    m_ui->showPanels();
 
     emit userLocationReady(user);
     emit friendsLocationsReady(friendsList);