From c4db40159768f6dd27ea128b3453c96a20073acd Mon Sep 17 00:00:00 2001 From: John Maguire Date: Wed, 12 Dec 2012 18:34:15 +0100 Subject: [PATCH] More or less working Skydrive authentication. --- CMakeLists.txt | 5 +++ data/data.qrc | 1 + data/providers/skydrive.png | Bin 0 -> 3592 bytes src/CMakeLists.txt | 8 ++++ src/config.h.in | 1 + src/internet/googledriveclient.cpp | 3 +- src/internet/internetmodel.cpp | 6 +++ src/internet/oauthenticator.cpp | 26 ++++++++---- src/internet/oauthenticator.h | 14 +++++-- src/internet/skydriveservice.cpp | 61 +++++++++++++++++++++++++++++ src/internet/skydriveservice.h | 26 ++++++++++++ src/ui/settingsdialog.h | 1 + 12 files changed, 141 insertions(+), 11 deletions(-) create mode 100644 data/providers/skydrive.png create mode 100644 src/internet/skydriveservice.cpp create mode 100644 src/internet/skydriveservice.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 490c4ba22..6c26bfcdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,6 +202,11 @@ optional_component(DROPBOX ON "Dropbox support" DEPENDS "Taglib 1.8" "TAGLIB_VERSION VERSION_GREATER 1.7.999" ) +optional_component(SKYDRIVE ON "Skydrive support" + DEPENDS "Google sparsehash" SPARSEHASH_INCLUDE_DIRS + DEPENDS "Taglib 1.8" "TAGLIB_VERSION VERSION_GREATER 1.7.999" +) + optional_component(AUDIOCD ON "Devices: Audio CD support" DEPENDS "libcdio" CDIO_FOUND ) diff --git a/data/data.qrc b/data/data.qrc index a0f1bef23..d68a182b9 100644 --- a/data/data.qrc +++ b/data/data.qrc @@ -291,6 +291,7 @@ providers/podcast16.png providers/podcast32.png providers/rockradio.png + providers/skydrive.png providers/skyfm.png providers/somafm.png providers/songkick.png diff --git a/data/providers/skydrive.png b/data/providers/skydrive.png new file mode 100644 index 0000000000000000000000000000000000000000..d76c6f935fc19eaed6bc408ef4856350cdfb5e57 GIT binary patch literal 3592 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 O0000StartAuthorisation( diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp index 17f382a3e..34e9f2c76 100644 --- a/src/internet/internetmodel.cpp +++ b/src/internet/internetmodel.cpp @@ -51,6 +51,9 @@ #ifdef HAVE_DROPBOX #include "dropboxservice.h" #endif +#ifdef HAVE_SKYDRIVE + #include "skydriveservice.h" +#endif using smart_playlists::Generator; using smart_playlists::GeneratorMimeData; @@ -97,6 +100,9 @@ InternetModel::InternetModel(Application* app, QObject* parent) #ifdef HAVE_DROPBOX AddService(new DropboxService(app, this)); #endif +#ifdef HAVE_SKYDRIVE + AddService(new SkydriveService(app, this)); +#endif } void InternetModel::AddService(InternetService *service) { diff --git a/src/internet/oauthenticator.cpp b/src/internet/oauthenticator.cpp index dfdfa330c..f8cb4a3bd 100644 --- a/src/internet/oauthenticator.cpp +++ b/src/internet/oauthenticator.cpp @@ -13,10 +13,12 @@ OAuthenticator::OAuthenticator( const QString& client_id, const QString& client_secret, + RedirectStyle redirect, QObject* parent) : QObject(parent), client_id_(client_id), - client_secret_(client_secret) { + client_secret_(client_secret), + redirect_style_(redirect) { } void OAuthenticator::StartAuthorisation( @@ -27,25 +29,35 @@ void OAuthenticator::StartAuthorisation( LocalRedirectServer* server = new LocalRedirectServer(this); server->Listen(); - NewClosure(server, SIGNAL(Finished()), - this, SLOT(RedirectArrived(LocalRedirectServer*)), server); - QUrl url = QUrl(oauth_endpoint); url.addQueryItem("response_type", "code"); url.addQueryItem("client_id", client_id_); - url.addQueryItem("redirect_uri", server->url().toString()); + QUrl redirect_url; + if (redirect_style_ == RedirectStyle::REMOTE) { + const int port = server->url().port(); + redirect_url = QUrl( + QString("http://data.clementine-player.org/skydrive?port=%1").arg(port)); + } else { + redirect_url = server->url(); + } + url.addQueryItem("redirect_uri", redirect_url.toString()); url.addQueryItem("scope", scope); + NewClosure(server, SIGNAL(Finished()), + this, SLOT(RedirectArrived(LocalRedirectServer*,QUrl)), + server, redirect_url); + QDesktopServices::openUrl(url); } -void OAuthenticator::RedirectArrived(LocalRedirectServer* server) { +void OAuthenticator::RedirectArrived( + LocalRedirectServer* server, QUrl url) { server->deleteLater(); QUrl request_url = server->request_url(); qLog(Debug) << Q_FUNC_INFO << request_url; RequestAccessToken( request_url.queryItemValue("code").toUtf8(), - server->url()); + url); } QByteArray OAuthenticator::ParseHttpRequest(const QByteArray& request) const { diff --git a/src/internet/oauthenticator.h b/src/internet/oauthenticator.h index 05a0d5081..8c229bcd5 100644 --- a/src/internet/oauthenticator.h +++ b/src/internet/oauthenticator.h @@ -12,9 +12,18 @@ class QTcpSocket; class OAuthenticator : public QObject { Q_OBJECT public: + enum class RedirectStyle { + // Redirect to localhost immediately. + LOCALHOST = 0, + // Redirect via data.clementine-player.org for when localhost is + // unsupported (eg. Skydrive). + REMOTE = 1, + }; + OAuthenticator( const QString& client_id, const QString& client_secret, + RedirectStyle redirect, QObject* parent = 0); void StartAuthorisation( const QString& oauth_endpoint, @@ -31,13 +40,12 @@ class OAuthenticator : public QObject { const QString& refresh_token() const { return refresh_token_; } const QDateTime& expiry_time() const { return expiry_time_; } - const QString& user_email() const { return user_email_; } signals: void Finished(); private slots: - void RedirectArrived(LocalRedirectServer* server); + void RedirectArrived(LocalRedirectServer* server, QUrl url); void FetchAccessTokenFinished(QNetworkReply* reply); void RefreshAccessTokenFinished(QNetworkReply* reply); @@ -51,11 +59,11 @@ class OAuthenticator : public QObject { QString access_token_; QString refresh_token_; QDateTime expiry_time_; - QString user_email_; const QString client_id_; const QString client_secret_; QUrl token_endpoint_; + RedirectStyle redirect_style_; }; #endif diff --git a/src/internet/skydriveservice.cpp b/src/internet/skydriveservice.cpp new file mode 100644 index 000000000..6f490e60a --- /dev/null +++ b/src/internet/skydriveservice.cpp @@ -0,0 +1,61 @@ +#include "skydriveservice.h" + +#include "oauthenticator.h" + +namespace { + +static const char* kServiceName = "Skydrive"; +static const char* kServiceId = "skydrive"; +static const char* kSettingsGroup = "Skydrive"; + +static const char* kClientId = "00000000400E7C78"; +static const char* kClientSecret = "B0KLZjEgC5SpW0KknrsBFwlaKmGThaAk"; + +static const char* kOAuthEndpoint = + "https://login.live.com/oauth20_authorize.srf"; +static const char* kOAuthTokenEndpoint = + "https://login.live.com/oauth20_token.srf"; +static const char* kOAuthScope = "wl.basic wl.skydrive wl.offline_access"; + +} // namespace + +SkydriveService::SkydriveService( + Application* app, + InternetModel* parent) + : CloudFileService( + app, parent, kServiceName, kServiceId, + QIcon(":providers/skydrive.png"), SettingsDialog::Page_Skydrive) { +} + +bool SkydriveService::has_credentials() const { + return true; +} + +void SkydriveService::Connect() { + OAuthenticator* oauth = new OAuthenticator( + kClientId, kClientSecret, OAuthenticator::RedirectStyle::REMOTE, this); + QSettings s; + s.beginGroup(kSettingsGroup); + if (s.contains("refresh_token")) { + oauth->RefreshAuthorisation( + kOAuthTokenEndpoint, s.value("refresh_token").toString()); + } else { + oauth->StartAuthorisation( + kOAuthEndpoint, + kOAuthTokenEndpoint, + kOAuthScope); + } + + NewClosure(oauth, SIGNAL(Finished()), + this, SLOT(ConnectFinished(OAuthenticator*)), oauth); +} + +void SkydriveService::ConnectFinished(OAuthenticator* oauth) { + qLog(Debug) << oauth->access_token() + << oauth->refresh_token(); + + QSettings s; + s.beginGroup(kSettingsGroup); + + s.setValue("refresh_token", oauth->refresh_token()); +} diff --git a/src/internet/skydriveservice.h b/src/internet/skydriveservice.h new file mode 100644 index 000000000..190ecc457 --- /dev/null +++ b/src/internet/skydriveservice.h @@ -0,0 +1,26 @@ +#ifndef SKYDRIVESERVICE_H +#define SKYDRIVESERVICE_H + +#include "cloudfileservice.h" + +class OAuthenticator; + +class SkydriveService : public CloudFileService { + Q_OBJECT + + public: + SkydriveService( + Application* app, + InternetModel* parent); + + protected: + // CloudFileService + virtual bool has_credentials() const; + virtual void Connect(); + + private slots: + void ConnectFinished(OAuthenticator* oauth); + +}; + +#endif // SKYDRIVESERVICE_H diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h index 643a225eb..3f874a6bb 100644 --- a/src/ui/settingsdialog.h +++ b/src/ui/settingsdialog.h @@ -79,6 +79,7 @@ public: Page_GoogleDrive, Page_UbuntuOne, Page_Dropbox, + Page_Skydrive, }; enum Role {