Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix DS assignment scripts responses

Browse source
This commit is contained in:
Atlante45 2016-01-22 15:55:43 -08:00
parent 822244ef72
commit 9330c3d4f3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
domain-server/src/DomainServer.cpp
View file

@ -1171,7 +1171,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
const QString JSON_MIME_TYPE = "application/json"; const QString JSON_MIME_TYPE = "application/json";
const QString URI_ASSIGNMENT = "/assignment"; const QString URI_ASSIGNMENT = "/assignment";
const QString URI_ASSIGNMENT_SCRIPTS = URI_ASSIGNMENT + "/scripts";
const QString URI_NODES = "/nodes"; const QString URI_NODES = "/nodes";
const QString URI_SETTINGS = "/settings"; const QString URI_SETTINGS = "/settings";
@ -1212,13 +1211,14 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
if (matchingAssignment && matchingAssignment->getType() == Assignment::AgentType) { if (matchingAssignment && matchingAssignment->getType() == Assignment::AgentType) {
// we have a matching assignment and it is for the right type, have the HTTP manager handle it // we have a matching assignment and it is for the right type, have the HTTP manager handle it
// via correct URL for the script so the client can download // via correct URL for the script so the client can download
QFile scriptFile(pathForAssignmentScript(matchingAssignment->getUUID()));
QUrl scriptURL = url;
scriptURL.setPath(URI_ASSIGNMENT + "/scripts/" if (scriptFile.exists() && scriptFile.open(QIODevice::ReadOnly)) {
+ uuidStringWithoutCurlyBraces(matchingAssignment->getUUID())); connection->respond(HTTPConnection::StatusCode200, scriptFile.readAll(), "application/javascript");
} else {
// have the HTTPManager serve the appropriate script file connection->respond(HTTPConnection::StatusCode404, "Resource not found.");
return _httpManager.handleHTTPRequest(connection, scriptURL, true); }
return true;
} }
// request not handled // request not handled