Add optional oauth authentication for tidal

src/settings/tidalsettingspage.cpp

@@ -31,6 +31,7 @@
 #include "core/iconloader.h"
 #include "internet/internetservices.h"
 #include "tidal/tidalservice.h"
+#include "tidal/tidalstreamurlrequest.h"
 
 const char *TidalSettingsPage::kSettingsGroup = "Tidal";
 
@@ -44,7 +45,9 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
 
   connect(ui_->button_login, SIGNAL(clicked()), SLOT(LoginClicked()));
   connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(LogoutClicked()));
+  connect(ui_->oauth, SIGNAL(toggled(bool)), SLOT(OAuthClicked(bool)));
 
+  connect(this, SIGNAL(Login()), service_, SLOT(StartAuthorisation()));
   connect(this, SIGNAL(Login(QString, QString, QString)), service_, SLOT(SendLogin(QString, QString, QString)));
 
   connect(service_, SIGNAL(LoginFailure(QString)), SLOT(LoginFailure(QString)));
@@ -63,6 +66,10 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
   ui_->coversize->addItem("750x750", "750x750");
   ui_->coversize->addItem("1280x1280", "1280x1280");
 
+  ui_->streamurl->addItem("streamurl", StreamUrlMethod_StreamUrl);
+  ui_->streamurl->addItem("urlpostpaywall", StreamUrlMethod_UrlPostPaywall);
+  ui_->streamurl->addItem("playbackinfopostpaywall", StreamUrlMethod_PlaybackInfoPostPaywall);
+
 }
 
 TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
@@ -72,12 +79,19 @@ void TidalSettingsPage::Load() {
   QSettings s;
 
   s.beginGroup(kSettingsGroup);
-  ui_->checkbox_enable->setChecked(s.value("enabled", false).toBool());
+  ui_->enable->setChecked(s.value("enabled", false).toBool());
+  ui_->oauth->setChecked(s.value("oauth", false).toBool());
+
+  ui_->client_id->setText(s.value("client_id").toString());
+  ui_->api_token->setText(s.value("api_token").toString());
+  ui_->user_id->setText(s.value("user_id").toString());
+  ui_->country_code->setText(s.value("country_code").toString());
+
   ui_->username->setText(s.value("username").toString());
   QByteArray password = s.value("password").toByteArray();
   if (password.isEmpty()) ui_->password->clear();
   else ui_->password->setText(QString::fromUtf8(QByteArray::fromBase64(password)));
-  ui_->token->setText(s.value("token").toString());
+
   dialog()->ComboBoxLoadFromSettings(s, ui_->quality, "quality", "HIGH");
   ui_->searchdelay->setValue(s.value("searchdelay", 1500).toInt());
   ui_->artistssearchlimit->setValue(s.value("artistssearchlimit", 5).toInt());
@@ -86,6 +100,12 @@ void TidalSettingsPage::Load() {
   ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool());
   ui_->checkbox_cache_album_covers->setChecked(s.value("cachealbumcovers", true).toBool());
   dialog()->ComboBoxLoadFromSettings(s, ui_->coversize, "coversize", "320x320");
+
+  StreamUrlMethod stream_url = static_cast<StreamUrlMethod>(s.value("streamurl").toInt());
+  int i = ui_->streamurl->findData(stream_url);
+  if (i == -1) i = ui_->streamurl->findData(StreamUrlMethod_StreamUrl);
+  ui_->streamurl->setCurrentIndex(i);
+
   s.endGroup();
 
   if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn);
@@ -96,10 +116,16 @@ void TidalSettingsPage::Save() {
 
   QSettings s;
   s.beginGroup(kSettingsGroup);
-  s.setValue("enabled", ui_->checkbox_enable->isChecked());
+  s.setValue("enabled", ui_->enable->isChecked());
+  s.setValue("oauth", ui_->oauth->isChecked());
+  s.setValue("client_id", ui_->client_id->text());
+  s.setValue("api_token", ui_->api_token->text());
+  s.setValue("user_id", ui_->user_id->text());
+  s.setValue("country_code", ui_->country_code->text());
+
   s.setValue("username", ui_->username->text());
   s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
-  s.setValue("token", ui_->token->text());
+
   s.setValue("quality", ui_->quality->itemData(ui_->quality->currentIndex()));
   s.setValue("searchdelay", ui_->searchdelay->value());
   s.setValue("artistssearchlimit", ui_->artistssearchlimit->value());
@@ -108,6 +134,7 @@ void TidalSettingsPage::Save() {
   s.setValue("fetchalbums", ui_->checkbox_fetchalbums->isChecked());
   s.setValue("cachealbumcovers", ui_->checkbox_cache_album_covers->isChecked());
   s.setValue("coversize", ui_->coversize->itemData(ui_->coversize->currentIndex()));
+  s.setValue("streamurl", ui_->streamurl->itemData(ui_->streamurl->currentIndex()));
   s.endGroup();
 
   service_->ReloadSettings();
@@ -115,8 +142,19 @@ void TidalSettingsPage::Save() {
 }
 
 void TidalSettingsPage::LoginClicked() {
-  emit Login(ui_->username->text(), ui_->password->text(), ui_->token->text());
+
+  if (ui_->oauth->isChecked()) {
+    emit Login();
+  }
+  else {
+    if (ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
+      QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing username or password."));
+      return;
+    }
+    emit Login(ui_->username->text(), ui_->password->text(), ui_->api_token->text());
+  }
   ui_->button_login->setEnabled(false);
+
 }
 
 bool TidalSettingsPage::eventFilter(QObject *object, QEvent *event) {
@@ -127,6 +165,16 @@ bool TidalSettingsPage::eventFilter(QObject *object, QEvent *event) {
   }
 
   return SettingsPage::eventFilter(object, event);
+
+}
+
+void TidalSettingsPage::OAuthClicked(bool enabled) {
+
+  ui_->client_id->setEnabled(enabled);
+  ui_->api_token->setEnabled(!enabled);
+  ui_->username->setEnabled(!enabled);
+  ui_->password->setEnabled(!enabled);
+
 }
 
 void TidalSettingsPage::LogoutClicked() {

src/settings/tidalsettingspage.h

@@ -38,15 +38,23 @@ class TidalSettingsPage : public SettingsPage {
 
   static const char *kSettingsGroup;
 
+  enum StreamUrlMethod {
+    StreamUrlMethod_StreamUrl,
+    StreamUrlMethod_UrlPostPaywall,
+    StreamUrlMethod_PlaybackInfoPostPaywall,
+  };
+
   void Load();
   void Save();
 
   bool eventFilter(QObject *object, QEvent *event);
 
  signals:
+  void Login();
   void Login(const QString &username, const QString &password, const QString &token);
 
  private slots:
+  void OAuthClicked(bool enabled);
   void LoginClicked();
   void LogoutClicked();
   void LoginSuccess();

src/settings/tidalsettingspage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>715</width>
-    <height>650</height>
+    <height>794</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="layout_tidalsettingspage">
    <item>
-    <widget class="QCheckBox" name="checkbox_enable">
+    <widget class="QCheckBox" name="enable">
      <property name="text">
       <string>Enable</string>
      </property>
@@ -37,47 +37,113 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Account details</string>
+      <string>Authentication</string>
      </property>
      <layout class="QFormLayout" name="layout_credential_group">
-      <item row="0" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="label_username">
         <property name="text">
-         <string>Tidal username</string>
+         <string>Username</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="5" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLineEdit" name="username"/>
         </item>
-        <item>
-         <widget class="QPushButton" name="button_login">
-          <property name="text">
-           <string>Login</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
-      <item row="1" column="0">
+      <item row="6" column="0">
        <widget class="QLabel" name="label_password">
         <property name="text">
-         <string>Tidal password</string>
+         <string>Password</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="6" column="1">
        <widget class="QLineEdit" name="password">
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_client_id">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Client ID</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="client_id"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_api_token">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>API Token</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="api_token">
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="oauth">
+        <property name="text">
+         <string>Use OAuth</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_user_id">
+        <property name="text">
+         <string>User ID</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="user_id"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_country_code">
+        <property name="text">
+         <string>Country Code</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="country_code"/>
+      </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QPushButton" name="button_login">
+     <property name="text">
+      <string>Login</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="LoginStateWidget" name="login_state" native="true"/>
    </item>
@@ -93,304 +159,136 @@
      <property name="title">
       <string>Preferences</string>
      </property>
-     <layout class="QVBoxLayout" name="layout_preferences">
-      <item>
-       <layout class="QHBoxLayout" name="layout_token">
-        <item>
-         <widget class="QLabel" name="label_token">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Token</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="token">
-          <property name="minimumSize">
-           <size>
-            <width>200</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="spacer_token">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_quality">
-        <item>
-         <widget class="QLabel" name="label_quality">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Audio quality</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="quality"/>
-        </item>
-        <item>
-         <spacer name="spacer_quality">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_searchdelay">
-        <item>
-         <widget class="QLabel" name="label_searchdelay">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Search delay</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="searchdelay">
-          <property name="suffix">
-           <string>ms</string>
-          </property>
-          <property name="minimum">
-           <number>0</number>
-          </property>
-          <property name="maximum">
-           <number>10000</number>
-          </property>
-          <property name="singleStep">
-           <number>50</number>
-          </property>
-          <property name="value">
-           <number>1500</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="spacer_searchdelay">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_artistssearchlimit">
-        <item>
-         <widget class="QLabel" name="label_artistssearchlimit">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Artists search limit</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="artistssearchlimit">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="spacer_artistssearchlimit">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_albumssearchlimit">
-        <item>
-         <widget class="QLabel" name="label_albumssearchlimit">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Albums search limit</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="albumssearchlimit">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>1000</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="spacer_albumssearchlimit">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_songssearchlimit">
-        <item>
-         <widget class="QLabel" name="label_songssearchlimit">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Songs search limit</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="songssearchlimit">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>1000</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="spacer_songssearchlimit">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="checkbox_fetchalbums">
+     <layout class="QFormLayout" name="layout_preferences">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_quality">
         <property name="text">
-         <string>Fetch entire albums when searching songs</string>
+         <string>Audio quality</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="quality"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_searchdelay">
+        <property name="text">
+         <string>Search delay</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="searchdelay">
+        <property name="suffix">
+         <string>ms</string>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>10000</number>
+        </property>
+        <property name="singleStep">
+         <number>50</number>
+        </property>
+        <property name="value">
+         <number>1500</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_artistssearchlimit">
+        <property name="text">
+         <string>Artists search limit</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="artistssearchlimit">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="value">
+         <number>50</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_albumssearchlimit">
+        <property name="text">
+         <string>Albums search limit</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="albumssearchlimit">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>1000</number>
+        </property>
+        <property name="value">
+         <number>50</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_songssearchlimit">
+        <property name="text">
+         <string>Songs search limit</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
        <widget class="QCheckBox" name="checkbox_cache_album_covers">
         <property name="text">
          <string>Cache album covers</string>
         </property>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="layout_coversize">
-        <item>
-         <widget class="QLabel" name="label_coversize">
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Album cover size</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="coversize"/>
-        </item>
-        <item>
-         <spacer name="spacer_coversize">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+      <item row="6" column="0">
+       <widget class="QCheckBox" name="checkbox_fetchalbums">
+        <property name="text">
+         <string>Fetch entire albums when searching songs</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1">
+       <widget class="QComboBox" name="coversize"/>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_coversize">
+        <property name="text">
+         <string>Album cover size</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="songssearchlimit">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>1000</number>
+        </property>
+        <property name="value">
+         <number>50</number>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_streamurl">
+        <property name="text">
+         <string>Stream URL method</string>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1">
+       <widget class="QComboBox" name="streamurl"/>
       </item>
      </layout>
     </widget>
@@ -457,7 +355,6 @@
  <tabstops>
   <tabstop>username</tabstop>
   <tabstop>password</tabstop>
-  <tabstop>button_login</tabstop>
  </tabstops>
  <resources>
   <include location="../../data/data.qrc"/>