dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add optional oauth authentication for tidal

Browse Source
This commit is contained in:
Jonas Kvinge
2019-06-09 19:29:25 +02:00
parent 85a0748ad9
commit c0c1457073
16 changed files with 766 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/tidal/tidalservice.h
View File

@@ -37,6 +37,7 @@
#include "core/song.h"
#include "internet/internetservice.h"
#include "internet/internetsearch.h"
#include "settings/tidalsettingspage.h"
class QSortFilterProxyModel;
class Application;
@@ -68,7 +69,11 @@ class TidalService : public InternetService {
const int max_login_attempts() { return kLoginAttempts; }
QString token() { return token_; }
const bool oauth() { return oauth_; }
QString client_id() { return client_id_; }
QString api_token() { return api_token_; }
quint64 user_id() { return user_id_; }
QString country_code() { return country_code_; }
QString username() { return username_; }
QString password() { return password_; }
QString quality() { return quality_; }
@@ -79,12 +84,12 @@ class TidalService : public InternetService {
bool fetchalbums() { return fetchalbums_; }
QString coversize() { return coversize_; }
bool cache_album_covers() { return cache_album_covers_; }
TidalSettingsPage::StreamUrlMethod stream_url_method() { return stream_url_method_; }
QString access_token() { return access_token_; }
QString session_id() { return session_id_; }
quint64 user_id() { return user_id_; }
QString country_code() { return country_code_; }
const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); }
const bool authenticated() { return (!access_token_.isEmpty() || !session_id_.isEmpty()); }
const bool login_sent() { return login_sent_; }
const bool login_attempts() { return login_attempts_; }
@@ -125,6 +130,9 @@ class TidalService : public InternetService {
void ResetSongsRequest();
private slots:
void StartAuthorisation();
void AuthorisationUrlReceived(const QUrl &url);
void AccessTokenRequestFinished(QNetworkReply *reply);
void SendLogin();
void HandleAuthReply(QNetworkReply *reply);
void ResetLoginAttempts();
@@ -141,12 +149,18 @@ class TidalService : public InternetService {
typedef QPair<QString, QString> Param;
typedef QList<Param> ParamList;
void LoadSessionID();
typedef QPair<QByteArray, QByteArray> EncodedParam;
typedef QList<EncodedParam> EncodedParamList;
void SendSearch();
QString LoginError(QString error, QVariant debug = QVariant());
static const char *kAuthUrl;
static const char *kClientIdB64;
static const char *kApiTokenB64;
static const char *kOAuthUrl;
static const char *kOAuthAccessTokenUrl;
static const char *kOAuthRedirectUrl;
static const char *kAuthUrl;
static const int kLoginAttempts;
static const int kTimeResetLoginAttempts;
@@ -183,7 +197,11 @@ class TidalService : public InternetService {
std::shared_ptr<TidalRequest> search_request_;
TidalFavoriteRequest *favorite_request_;
QString token_;
bool oauth_;
QString client_id_;
QString api_token_;
quint64 user_id_;
QString country_code_;
QString username_;
QString password_;
QString quality_;
@@ -194,10 +212,12 @@ class TidalService : public InternetService {
bool fetchalbums_;
QString coversize_;
bool cache_album_covers_;
TidalSettingsPage::StreamUrlMethod stream_url_method_;
QString access_token_;
QString refresh_token_;
QString session_id_;
quint64 user_id_;
QString country_code_;
QDateTime expiry_time_;
int pending_search_id_;
int next_pending_search_id_;