Changeset 2

Timestamp:

02/03/10 22:06:42 (2 years ago)

Author:

roeland

Message:

Basic contact retrival works.

Location:

libQtGdata/trunk

Files:

• QtGdata.pro (modified) (1 diff)
• helper (added)
• helper/syncnetworkaccessmanager.cpp (added)
• helper/syncnetworkaccessmanager.h (added)
• qtgdata.cpp (modified) (5 diffs)
• qtgdata.h (modified) (2 diffs)
• qtgdata_calendar.cpp (modified) (1 diff)
• qtgdata_calendar.h (modified) (2 diffs)
• qtgdata_contact.cpp (added)
• qtgdata_contacts.cpp (added)
• qtgdata_contacts.h (added)

libQtGdata/trunk/QtGdata.pro

@@ -7 +7 @@
 TARGET = QtGdata
 TEMPLATE = lib
-VERSION = 0.0.1
+VERSION = 0.0.2
 DEFINES += QTGDATA_LIBRARY
 SOURCES += qtgdata.cpp \
-    qtgdata_calendar.cpp
+    qtgdata_calendar.cpp \
+    helper/syncnetworkaccessmanager.cpp \
+    qtgdata_contacts.cpp
 HEADERS += qtgdata.h \
     QtGdata_global.h \
-    qtgdata_calendar.h
+    qtgdata_calendar.h \
+    helper/syncnetworkaccessmanager.h \
+    qtgdata_contacts.h

libQtGdata/trunk/qtgdata.cpp

@@ -4 +4 @@
 #include <QStringList>
 
-#include <QNetworkAccessManager>
+//#include <QNetworkAccessManager>
+#include "helper/syncnetworkaccessmanager.h"
 #include <QNetworkReply>
 
 #include <QDebug>
 
-QtGdata::QtGdata(const QString email, const QString password,
-                 const QString appString,
-                 const GDATA_ACCOUNT_TYPE type = GDATA_ACCOUNT_TYPE_HOSTED_OR_GOOGLE)
+/**
+ * Constructor
+ *
+ * @param email E-mail (account name)
+ * @param password Password for this account
+ * @param service String decribing the service to connect to
+ * @param accountType How to connect to google
+ *
+ */
+QtGdata::QtGdata(const QString email,
+                 const QString password,
+                 const QString service,
+                 const QString loginURL,
+                 const GDATA_ACCOUNT_TYPE accountType)
 {
-  QNetworkAccessManager *manager = new QNetworkAccessManager();
+  login(email, password, service, loginURL, accountType);
+}
+
+/**
+ * @param email E-mail (account name)
+ * @param password Password for this account
+ * @param service String describing the server you want to connect to
+ * @param accountType How to connect
+ * @param loginToken The captcha token
+ * @param loginCaptcha The text in the captcha (according to the user)
+ */
+void QtGdata::login(const QString email,
+                    const QString password,
+                    const QString service,
+                    const QString loginURL,
+                    const GDATA_ACCOUNT_TYPE accountType,
+                    const QString loginToken,
+                    const QString loginCaptcha)
+{
+  this->email = email;
+  this->password = password;
+
+  SyncNetworkAccessManager manager;
   QNetworkRequest request;
-  request.setUrl(QUrl("https://www.google.com/accounts/ClientLogin"));
+  request.setUrl(QUrl(loginURL));
   request.setRawHeader("User-Agent", "QtGdata 0.0.1");
   request.setRawHeader("Content-type", "application/x-www-form-urlencoded");
@@ -22 +56 @@
   QString data = "";
 
-  switch(type) {
+  /* Request the right access */
+  switch(accountType) {
     case QtGdata::GDATA_ACCOUNT_TYPE_GOOGLE:
       data = "accountType=GOOGLE";
@@ -36 +71 @@
   data += "&Email=" + email;
   data += "&Passwd=" + password;
-  data += "&service=" + appString;
+  data += "&service=" + service;
   data += "&source=QtGdata-0.0.1";
 
-  connect(manager, SIGNAL(finished(QNetworkReply*)),
-         this, SLOT(finished(QNetworkReply*)));
+  /* Check for captcha stuff */
+  if (!loginToken.isNull() && !loginCaptcha.isNull()) {
+    data += "&logintoken=" + loginToken;
+    data += "&logincaptcha=" + loginCaptcha;
+  }
 
-  manager->post(request, data.toAscii());
-}
-
-
-void QtGdata::finished(QNetworkReply *reply)
-{
+  /* Get response */
+  QNetworkReply *reply = manager.syncPost(request, data.toAscii());
   int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 
@@ -64 +98 @@
         }
       }
-      emit loginSucces();
+      this->valid = 0;
       break;
     case 403:
@@ -70 +104 @@
       break;
     default:
-      qDebug() << reply->readAll();
       break;
   }
+
 }
+
+bool QtGdata::isValid()
+{
+  return valid;
+}
+
+QByteArray QtGdata::getFeed(const QString url)
+{
+  QNetworkRequest request;
+  request.setUrl(QUrl(url));
+  request.setRawHeader("User-Agent", "QtGdata 0.0.1");
+  request.setRawHeader("GData-Version", "2");
+
+  QString authHeader = "GoogleLogin auth=" + Auth;
+  request.setRawHeader("Authorization", authHeader.toAscii());
+
+  SyncNetworkAccessManager manager;
+  QNetworkReply * reply = manager.syncGet(request);
+
+  return reply->readAll();
+}

libQtGdata/trunk/qtgdata.h

@@ -7 +7 @@
 #include <QNetworkReply>
 #include <QString>
+#include <QByteArray>
 
 class QtGdata : public QObject
@@ -19 +20 @@
     };
 
-    QtGdata(const QString email, const QString password, const QString appString, const GDATA_ACCOUNT_TYPE);
+    enum GDATA_REQUEST {
+      GDATA_REQUEST_SUCCESS,
+      GDATA_REQUEST_AUTH_ERR
+    };
+
+    bool isValid();
+
+  protected:
+    QtGdata(const QString email,
+            const QString password,
+            const QString service,
+            const QString loginURL = "https://www.google.com/accounts/ClientLogin",
+            const GDATA_ACCOUNT_TYPE accountType = QtGdata::GDATA_ACCOUNT_TYPE_HOSTED_OR_GOOGLE);
+
+    QByteArray getFeed(const QString url);
+
+    QString email;
+    QString password;
 
   private:
+      void login(const QString email,
+                 const QString password,
+                 const QString service,
+                 const QString loginURL = "https://www.google.com/accounts/ClientLogin",
+                 const GDATA_ACCOUNT_TYPE accountType = QtGdata::GDATA_ACCOUNT_TYPE_HOSTED_OR_GOOGLE,
+                 const QString loginToken = QString(),
+                 const QString loginCaptcha = QString());
+
       QString SID;
       QString LSID;
       QString Auth;
 
-  private slots:
-    void finished(QNetworkReply *reply);
-
-  signals:
-    void loginSucces();
-    void loginFailed();
-    void loginCaptcha();
+      bool valid;
 };
 

libQtGdata/trunk/qtgdata_calendar.cpp

@@ -4 +4 @@
 
 QtGdata_calendar::QtGdata_calendar(const QString username, const QString password) :
-QtGdata(username, password, "cl", QtGdata::GDATA_ACCOUNT_TYPE_HOSTED_OR_GOOGLE)
+QtGdata(username, password, "cl")
 {
 
 }
+
+QStringList QtGdata_calendar::getCalendars()
+{
+
+}

libQtGdata/trunk/qtgdata_calendar.h

@@ -5 +5 @@
 
 #include <QString>
+#include <QStringList>
 
 class QtGdata_calendar : public QtGdata
@@ -10 +11 @@
 public:
     QtGdata_calendar(const QString username, const QString password);
+
+    QStringList getCalendars();
 };