完善登录

okstar-org · Aug 7, 2024 · 9537bf6 · 9537bf6
1 parent 7223333
commit 9537bf6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/UI/window/login/src/LoginWidget.cpp b/src/UI/window/login/src/LoginWidget.cpp
@@ -292,11 +292,6 @@ void LoginWidget::onError(int statusCode, const QString& msg) {
             m_currentOriginalMsg = "Network is not available!";
             break;
         }
-        case 4: {
-            newMsg = tr("Account does not exist!");
-            m_currentOriginalMsg = "Account does not exist!";
-            break;
-        }
         case 5: {
             newMsg = tr("Server error, please try again later!");
             m_currentOriginalMsg = "Server error, please try again later!";

diff --git a/src/lib/backend/PassportService.cpp b/src/lib/backend/PassportService.cpp
@@ -49,7 +49,11 @@ bool PassportService::signIn(const QString& account, const QString& password,
                 Res<SysToken> res(Jsons::toJSON(doc));
                 fn(res);
             },
-            nullptr, nullptr, err);
+            nullptr, nullptr,
+            [=](int statusCode, QByteArray body) {
+                Res<SysToken> res(Jsons::toJSON(body));
+                err(statusCode, res.msg.toUtf8());
+            });
 }
 
 bool PassportService::refresh(const SysToken& token, Fn<void(Res<SysRefreshToken>&)> fn,

diff --git a/src/lib/network/NetworkHttp.cpp b/src/lib/network/NetworkHttp.cpp
@@ -229,18 +229,17 @@ void NetworkHttp::doRequest(QNetworkRequest& req,
             qDebug() << "statusCode:" << statusCode.toInt();
         }
 
+        auto bytes = reply->readAll();
         if (statusCode.toInt() / 100 != 2) {
-            qWarning() << "Error:" << reply->errorString();
+            qWarning() << "body:" << bytes;
             if (failed) {
-                failed(statusCode.toInt(), reply->errorString());
+                failed(statusCode.toInt(), bytes);
             }
             return;
         }
 
-        auto bytes = reply->readAll();
         auto size = bytes.size();
         qDebug() << "Received bytes:" << size;
-
         if (size <= 0) {
             qWarning() << "No content!";
             return;
@@ -257,7 +256,7 @@ void NetworkHttp::doRequest(QNetworkRequest& req,
             qDebug() << "content-type:" << type;
             if (type.startsWith("text/", Qt::CaseInsensitive) ||
                 type.startsWith(CONTENT_TYPE_JSON, Qt::CaseInsensitive))
-                qDebug() << "body:" << (QString::fromUtf8(bytes));
+                qDebug() << "body:" << QString::fromUtf8(bytes);
         }
 
         auto cdh = reply->header(QNetworkRequest::KnownHeaders::ContentDispositionHeader);

diff --git a/src/lib/network/NetworkHttp.h b/src/lib/network/NetworkHttp.h
@@ -30,7 +30,7 @@ class QNetworkReply;
 
 namespace network {
 
-using HttpErrorFn = Fn<void(int statusCode, const QString& errStr)>;
+using HttpErrorFn = Fn<void(int statusCode, const QByteArray body)>;
 using HttpDownloadProgressFn = Fn<void(qint64 bytesReceived, qint64 bytesTotal)>;
 using HttpUploadProgressFn = Fn<void(qint64 bytesSent, qint64 bytesTotal)>;
 using HttpBodyFn = Fn<void(QByteArray body, QString filename)>;