fix authorized websockets, fix download button in manga number

Suwayomi · Oct 11, 2022 · e7eb88e · e7eb88e
1 parent 7e615c9
commit e7eb88e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/src/models/DownloadsModel.cpp b/src/models/DownloadsModel.cpp
@@ -57,14 +57,22 @@ void DownloadsModel::setupWebsocket()
 
   connect(&_webSocket, &QWebSocket::connected, this, &DownloadsModel::onConnected);
   connect(&_webSocket, &QWebSocket::disconnected, this, &DownloadsModel::closed);
+  connect(&_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
+  [=](QAbstractSocket::SocketError error){
+    qDebug() << "error: " << error << _webSocket.errorString();
+  });
   auto resolved = _networkManager->resolvedPath().arg("/api/v1/downloads");
   bool ssl = resolved.startsWith("https", Qt::CaseInsensitive);
   resolved = resolved.mid(resolved.indexOf('/', resolved.indexOf(':'))+2);
   resolved = QStringLiteral("%1://%2")
     .arg(ssl ? "wss" : "ws")
     .arg(resolved);
 
-  _webSocket.open(QUrl(resolved));
+  QNetworkRequest request;
+  request.setUrl(resolved);
+  request.setRawHeader("Authorization", QString("Basic %1").arg(QByteArray(QString("%1:%2").arg(_networkManager->username()).arg(_networkManager->password()).toUtf8()).toBase64()).toUtf8());
+
+  _webSocket.open(request);
 }
 
 /******************************************************************************

diff --git a/src/models/UpdatesModel.cpp b/src/models/UpdatesModel.cpp
@@ -84,6 +84,10 @@ void UpdatesModel::componentComplete()
 {
   connect(&_webSocket, &QWebSocket::connected, this, &UpdatesModel::onConnected);
   connect(&_webSocket, &QWebSocket::disconnected, this, &UpdatesModel::closed);
+  connect(&_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
+  [=](QAbstractSocket::SocketError error){
+    qDebug() << "error: " << error << _webSocket.errorString();
+  });
   connect(
       _networkManager,
       &NetworkManager::receiveUpdates,
@@ -97,7 +101,11 @@ void UpdatesModel::componentComplete()
     .arg(ssl ? "wss" : "ws")
     .arg(resolved);
 
-  _webSocket.open(QUrl(resolved));
+  QNetworkRequest request;
+  request.setUrl(resolved);
+  request.setRawHeader("Authorization", QString("Basic %1").arg(QByteArray(QString("%1:%2").arg(_networkManager->username()).arg(_networkManager->password()).toUtf8()).toBase64()).toUtf8());
+
+  _webSocket.open(request);
 
   next();
 }

diff --git a/src/networkmanager.h b/src/networkmanager.h
@@ -51,6 +51,14 @@ private slots:
 
   QNetworkAccessManager *create(QObject *parent) override;
 
+  const auto& username() const {
+    return _username;
+  }
+
+  const auto& password() const {
+    return _password;
+  }
+
   void get(const QString &endpoint);
   void get(
     const QString &endpoint,

diff --git a/src/qml/MangaDetails.qml b/src/qml/MangaDetails.qml
@@ -364,7 +364,7 @@ Item {
         MouseArea {
           anchors.fill: parent
           onClicked: {
-            chaptersModel.downloadChapter(ChaptersModel.DownloadCustom, chapterNumber)
+            chaptersModel.downloadChapter(ChaptersModel.DownloadCustom, chapterIndex)
           }
         }
       }