Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-07-12 00:28:12 -07:00
parent 170b97514b
commit e466f76b75
2 changed files with 3 additions and 10 deletions

View File

@@ -837,16 +837,11 @@ namespace OpenWifi {
.DevicePassword = ""
};
std::cout << __LINE__ << std::endl;
if(RTTYS_server()->UseInternal()) {
std::cout << __LINE__ << std::endl;
Rtty.Token = MicroService::instance().CreateHash(UserInfo_.webtoken.refresh_token_ + std::to_string(OpenWifi::Now())).substr(0,32);
std::cout << __LINE__ << std::endl;
RTTYS_server()->CreateEndPoint(Rtty.ConnectionId,Rtty.Token, UserInfo_.userinfo.email, SerialNumber_);
std::cout << __LINE__ << std::endl;
RTTYS_server()->CreateEndPoint(Rtty.ConnectionId, Rtty.Token, UserInfo_.userinfo.email, SerialNumber_);
}
std::cout << __LINE__ << std::endl;
Poco::JSON::Object ReturnedObject;
Rtty.to_json(ReturnedObject);
@@ -868,16 +863,14 @@ namespace OpenWifi {
Params.set(uCentralProtocol::USER, UserInfo_.webtoken.username_);
Params.set(uCentralProtocol::TIMEOUT, Rtty.TimeOut);
Params.set(uCentralProtocol::PASSWORD, Device.DevicePassword);
std::cout << __LINE__ << std::endl;
std::stringstream ParamStream;
Params.stringify(ParamStream);
Cmd.Details = ParamStream.str();
std::cout << __LINE__ << std::endl;
Logger_.information(fmt::format("RTTY: user={} serial={} id={}.", UserInfo_.userinfo.email,SerialNumber_,Rtty.ConnectionId));
return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000ms, &ReturnedObject, this, Logger_);
}
Logger_.information(fmt::format("RTTY: user={} serial={}. Device does not exist.", UserInfo_.userinfo.email,SerialNumber_));
return NotFound();
}
Logger_.information(fmt::format("RTTY: user={} serial={}. Internal error.", UserInfo_.userinfo.email,SerialNumber_));