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

Tidal: Remove deprecated username/password login

Browse Source
This commit is contained in:
Jonas Kvinge
2025-02-01 22:10:53 +01:00
parent eac5674891
commit ba354207d2
14 changed files with 70 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tidal/tidalservice.h
View File

@@ -74,7 +74,6 @@ class TidalService : public StreamingService {
static const Song::Source kSource;
static const char kApiUrl[];
static const char kResourcesUrl[];
static const int kLoginAttempts;
void Exit() override;
void ReloadSettings() override;
@@ -83,15 +82,9 @@ class TidalService : public StreamingService {
int Search(const QString &text, StreamingSearchView::SearchType type) override;
void CancelSearch() override;
int max_login_attempts() const { return kLoginAttempts; }
bool oauth() const override { return oauth_; }
QString client_id() const { return client_id_; }
QString api_token() const { return api_token_; }
quint64 user_id() const { return user_id_; }
QString country_code() const { return country_code_; }
QString username() const { return username_; }
QString password() const { return password_; }
QString quality() const { return quality_; }
int artistssearchlimit() const { return artistssearchlimit_; }
int albumssearchlimit() const { return albumssearchlimit_; }
@@ -103,11 +96,8 @@ class TidalService : public StreamingService {
bool album_explicit() const { return album_explicit_; }
QString access_token() const { return access_token_; }
QString session_id() const { return session_id_; }
bool authenticated() const override { return (!access_token_.isEmpty() || !session_id_.isEmpty()); }
bool login_sent() const { return login_sent_; }
bool login_attempts() const { return login_attempts_; }
bool authenticated() const override { return !access_token_.isEmpty(); }
uint GetStreamURL(const QUrl &url, QString &error);
@@ -125,9 +115,6 @@ class TidalService : public StreamingService {
public Q_SLOTS:
void StartAuthorization(const QString &client_id);
void TryLogin();
void SendLogin();
void SendLoginWithCredentials(const QString &api_token, const QString &username, const QString &password);
void GetArtists() override;
void GetAlbums() override;
void GetSongs() override;
@@ -141,8 +128,6 @@ class TidalService : public StreamingService {
void RequestNewAccessToken() { RequestAccessToken(); }
void HandleLoginSSLErrors(const QList<QSslError> &ssl_errors);
void AccessTokenRequestFinished(QNetworkReply *reply);
void HandleAuthReply(QNetworkReply *reply);
void ResetLoginAttempts();
void StartSearch();
void ArtistsResultsReceived(const int id, const SongMap &songs, const QString &error);
void AlbumsResultsReceived(const int id, const SongMap &songs, const QString &error);
@@ -178,7 +163,6 @@ class TidalService : public StreamingService {
CollectionModel *songs_collection_model_;
QTimer *timer_search_delay_;
QTimer *timer_login_attempt_;
QTimer *timer_refresh_login_;
SharedPtr<TidalRequest> artists_request_;
@@ -188,13 +172,9 @@ class TidalService : public StreamingService {
TidalFavoriteRequest *favorite_request_;
bool enabled_;
bool oauth_;
QString client_id_;
QString api_token_;
quint64 user_id_;
QString country_code_;
QString username_;
QString password_;
QString quality_;
int artistssearchlimit_;
int albumssearchlimit_;
@@ -207,7 +187,6 @@ class TidalService : public StreamingService {
QString access_token_;
QString refresh_token_;
QString session_id_;
quint64 expires_in_;
quint64 login_time_;
@@ -218,8 +197,6 @@ class TidalService : public StreamingService {
int search_id_;
QString search_text_;
bool login_sent_;
int login_attempts_;
QString code_verifier_;
QString code_challenge_;