API authentication token is read from settings and set as bearer token.
This commit is contained in:
@ -276,8 +276,10 @@ void GenericCore::applyServerConfiguration() {
|
|||||||
const QVariantMap serverSettings = SettingsHandler::getSettings("Server");
|
const QVariantMap serverSettings = SettingsHandler::getSettings("Server");
|
||||||
const QString urlValue = serverSettings.value("url").toString();
|
const QString urlValue = serverSettings.value("url").toString();
|
||||||
if (!urlValue.isEmpty()) {
|
if (!urlValue.isEmpty()) {
|
||||||
const QString emailValue = serverSettings.value("email").toString();
|
const QString emailValue = serverSettings.value("email").toString();
|
||||||
const QString passwordValue = serverSettings.value("password").toString();
|
const QString passwordValue = serverSettings.value("password").toString();
|
||||||
m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue);
|
const QString authTokenValue = serverSettings.value("authToken").toString();
|
||||||
|
m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue,
|
||||||
|
authTokenValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,6 +36,21 @@ void ServerCommunicator::setUrl(const QUrl& url) {
|
|||||||
emit urlChanged();
|
emit urlChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ServerCommunicator::setServerConfiguration(const QString url,
|
||||||
|
const QString email,
|
||||||
|
const QString password,
|
||||||
|
const QString authToken) {
|
||||||
|
setUrl(url);
|
||||||
|
|
||||||
|
m_email = email;
|
||||||
|
m_password = password;
|
||||||
|
m_authToken = authToken;
|
||||||
|
|
||||||
|
if (!authToken.isEmpty()) {
|
||||||
|
m_serviceApi->setBearerToken(authToken.toLatin1());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ServerCommunicator::fetchItems() {
|
void ServerCommunicator::fetchItems() {
|
||||||
/// Set up a GET request
|
/// Set up a GET request
|
||||||
m_restManager->get(m_serviceApi->createRequest(ROUTE_ITEMS), this, [this](QRestReply& reply) {
|
m_restManager->get(m_serviceApi->createRequest(ROUTE_ITEMS), this, [this](QRestReply& reply) {
|
||||||
@ -94,13 +109,4 @@ void ServerCommunicator::deleteItem(const QString& id) {
|
|||||||
}
|
}
|
||||||
reply->deleteLater();
|
reply->deleteLater();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerCommunicator::setServerConfiguration(const QString url,
|
|
||||||
const QString email,
|
|
||||||
const QString password) {
|
|
||||||
setUrl(url);
|
|
||||||
|
|
||||||
m_email = email;
|
|
||||||
m_password = password;
|
|
||||||
}
|
|
||||||
@ -16,7 +16,10 @@ class ServerCommunicator : public QObject {
|
|||||||
QUrl url() const;
|
QUrl url() const;
|
||||||
void setUrl(const QUrl& url);
|
void setUrl(const QUrl& url);
|
||||||
|
|
||||||
void setServerConfiguration(const QString url, const QString email, const QString password);
|
void setServerConfiguration(const QString url,
|
||||||
|
const QString email,
|
||||||
|
const QString password,
|
||||||
|
const QString authToken);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void fetchItems();
|
void fetchItems();
|
||||||
@ -40,7 +43,7 @@ class ServerCommunicator : public QObject {
|
|||||||
|
|
||||||
QString m_email;
|
QString m_email;
|
||||||
QString m_password;
|
QString m_password;
|
||||||
// QString m_authToken;
|
QString m_authToken;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SERVERCOMMUNICATOR_H
|
#endif // SERVERCOMMUNICATOR_H
|
||||||
|
|||||||
Reference in New Issue
Block a user