flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #764, improved JSON response with messages for JSON authentication service

Browse Source
This commit is contained in:
Klaus Basan
2016-09-13 03:53:52 +02:00
committed by Roland Winklmeier
parent 67fdfd228a
commit 03b5f9ce2c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/db/databaseauthentication.cpp
View File

@@ -121,16 +121,23 @@ namespace BlackCore
return; return;
} }
QJsonObject jsonObj(Json::jsonObjectFromString(json));
CAuthenticatedUser user(CAuthenticatedUser::fromDatabaseJson(jsonObj));
CStatusMessageList msgs;
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation()})); static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation()}));
QJsonObject jsonObj(Json::jsonObjectFromString(json));
CAuthenticatedUser user = CAuthenticatedUser::fromDatabaseJson(jsonObj.contains("user") ? jsonObj["user"].toObject() : jsonObj);
CStatusMessageList msgs;
if (jsonObj.contains("messages"))
{
msgs = CStatusMessageList::fromDatabaseJson(jsonObj["messages"].toArray());
msgs.setCategories(cats);
}
if (!user.isAuthenticated() || !user.isValid()) if (!user.isAuthenticated() || !user.isValid())
{
if (!msgs.hasErrorMessages())
{ {
msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Cannot login, user or password wrong")); msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Cannot login, user or password wrong"));
} }
}
else else
{ {
if (!user.isEnabled()) if (!user.isEnabled())

1
src/blackgui/components/dblogincomponent.cpp
View File

@@ -54,6 +54,7 @@ namespace BlackGui
connect(ui->pb_Login, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLoginClicked); connect(ui->pb_Login, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLoginClicked);
connect(ui->pb_Logoff, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLogoffClicked); connect(ui->pb_Logoff, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLogoffClicked);
connect(&m_loginService, &CDatabaseAuthenticationService::userAuthenticationFinished, this, &CDbLoginComponent::ps_AuthenticationFinished); connect(&m_loginService, &CDatabaseAuthenticationService::userAuthenticationFinished, this, &CDbLoginComponent::ps_AuthenticationFinished);
connect(ui->le_Password, &QLineEdit::returnPressed, this, &CDbLoginComponent::ps_onLoginClicked);
} }
CDbLoginComponent::~CDbLoginComponent() CDbLoginComponent::~CDbLoginComponent()