Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 14:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

converted JsonAPI with public api and using RestbedService system

Browse source
This commit is contained in:
csoler 2019-11-16 00:02:02 +01:00
parent 3ca22f0052
commit a304ec20ef
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
10 changed files with 198 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/settings/JsonApiPage.cc
View file

@ -94,7 +94,7 @@ void JsonApiPage::load()
QStringList newTk;
for(const auto& it : JsonApiServer::instance().getAuthorizedTokens())
for(const auto& it : rsJsonAPI->getAuthorizedTokens())
newTk.push_back(QString::fromStdString(it.first)+":"+QString::fromStdString(it.second)) ;
whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
@ -105,17 +105,17 @@ QString JsonApiPage::helpText() const { return ""; }
/*static*/ bool JsonApiPage::checkStartJsonApi()
{
if(Settings->getJsonApiEnabled())
JsonApiServer::instance().start( Settings->getJsonApiPort(), Settings->getJsonApiListenAddress().toStdString() );
rsJsonAPI->restart();
return true;
}
/*static*/ void JsonApiPage::checkShutdownJsonApi()
{
if(!JsonApiServer::instance().isRunning())
rsJsonAPI->isRunning())
return;
JsonApiServer::instance().shutdown(); // this is a blocking call until the thread is terminated.
rsJsonAPI->stop(); // this is a blocking call until the thread is terminated.
#ifdef SUSPENDED_CODE
/* It is important to make a copy of +jsonApiServer+ pointer so the old
@ -148,17 +148,21 @@ void JsonApiPage::onApplyClicked(bool)
// restart
checkShutdownJsonApi();
rsJsonAPI->setListeningPort(ui.portSpinBox->value());
rsJsonAPI->setBindingAddress(ui.listenAddressLineEdit->text().toStdString());
checkStartJsonApi();
}
void JsonApiPage::addTokenClicked(bool)
{
QString token(ui.tokenLineEdit->text());
JsonApiServer::instance().authorizeToken(token.toStdString());
rsJsonAPI->authorizeUser(token.toStdString());
QStringList newTk;
for(const auto& it : JsonApiServer::instance().getAuthorizedTokens())
for(const auto& it : rsJsonAPI->getAuthorizedTokens())
newTk.push_back(QString::fromStdString(it.first)+":"+QString::fromStdString(it.second)) ;
whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
@ -167,11 +171,11 @@ void JsonApiPage::addTokenClicked(bool)
void JsonApiPage::removeTokenClicked(bool)
{
QString token(ui.tokenLineEdit->text());
JsonApiServer::instance().revokeAuthToken(token.toStdString());
rsJsonAPI->revokeAuthToken(token.toStdString());
QStringList newTk;
for(const auto& it : JsonApiServer::instance().getAuthorizedTokens())
for(const auto& it : rsJsonAPI->getAuthorizedTokens())
newTk.push_back(QString::fromStdString(it.first)+":"+QString::fromStdString(it.second)) ;
whileBlocking(ui.tokensListView)->setModel(new QStringListModel(Settings->getJsonApiAuthTokens()) );