Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added missing db prefix

This commit is contained in:
Frank Celler 2014-01-16 14:08:45 +01:00
parent c2c574d828
commit 87009c7e6e
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
js/server/modules/org/arangodb/actions.js Normal file → Executable file
View File

@ -1487,13 +1487,46 @@ function resultUnsupported (req, res, headers) {
/// @brief internal function for handling redirects /// @brief internal function for handling redirects
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function handleRedirect (req, res, destination, headers) { function handleRedirect (req, res, options, headers) {
var destination;
var url;
destination = options.destination;
if (destination.substr(0,5) !== "http:" && destination.substr(0,6) !== "https:") {
url = req.protocol + "://";
if (req.headers.hasOwnProperty('host')) {
url += req.headers.host;
}
else {
url += req.server.address + ":" + req.server.port;
}
if (options.relative) {
var u = req.url;
if (0 < u.length && u[u.length - 1] === '/') {
url += "/_db/" + encodeURIComponent(req.database) + u + destination;
}
else {
url += "/_db/" + encodeURIComponent(req.database) + u + "/" + destination;
}
}
else {
url += destination;
}
}
else {
url = destination;
}
res.contentType = "text/html"; res.contentType = "text/html";
res.body = "<html><head><title>Moved</title>" res.body = "<html><head><title>Moved</title>"
+ "</head><body><h1>Moved</h1><p>This page has moved to <a href=\"" + "</head><body><h1>Moved</h1><p>This page has moved to <a href=\""
+ destination + url
+ "\">" + "\">"
+ destination + url
+ "</a>.</p></body></html>"; + "</a>.</p></body></html>";
if (headers !== undefined) { if (headers !== undefined) {
@ -1503,56 +1536,39 @@ function handleRedirect (req, res, destination, headers) {
res.headers = {}; res.headers = {};
} }
res.headers.location = destination; res.headers.location = url;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief generates a permanently redirect /// @brief generates a permanently redirect
/// ///
/// @FUN{actions.resultPermanentRedirect(@FA{req}, @FA{res}, @FA{destination}, @FA{headers})} /// @FUN{actions.resultPermanentRedirect(@FA{req}, @FA{res}, @FA{options}, @FA{headers})}
/// ///
/// The function generates a redirect response. /// The function generates a redirect response.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function resultPermanentRedirect (req, res, destination, headers) { function resultPermanentRedirect (req, res, options, headers) {
'use strict'; 'use strict';
res.responseCode = exports.HTTP_MOVED_PERMANENTLY; res.responseCode = exports.HTTP_MOVED_PERMANENTLY;
if (destination.substr(0,5) !== "http:" && destination.substr(0,6) !== "https:") { handleRedirect(req, res, options, headers);
if (req.headers.hasOwnProperty('host')) {
destination = req.protocol
+ "://"
+ req.headers.host
+ destination;
}
else {
destination = req.protocol
+ "://"
+ req.server.address
+ ":"
+ req.server.port
+ destination;
}
}
handleRedirect(req, res, destination, headers);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief generates a temporary redirect /// @brief generates a temporary redirect
/// ///
/// @FUN{actions.resultTemporaryRedirect(@FA{req}, @FA{res}, @FA{destination}, @FA{headers})} /// @FUN{actions.resultTemporaryRedirect(@FA{req}, @FA{res}, @FA{options}, @FA{headers})}
/// ///
/// The function generates a redirect response. /// The function generates a redirect response.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function resultTemporaryRedirect (req, res, destination, headers) { function resultTemporaryRedirect (req, res, options, headers) {
'use strict'; 'use strict';
res.responseCode = exports.HTTP_TEMPORARY_REDIRECT; res.responseCode = exports.HTTP_TEMPORARY_REDIRECT;
handleRedirect(req, res, destination, headers); handleRedirect(req, res, options, headers);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -1867,10 +1883,10 @@ function redirectRequest (req, res, options, next) {
'use strict'; 'use strict';
if (options.permanently) { if (options.permanently) {
resultPermanentRedirect(req, res, options.destination); resultPermanentRedirect(req, res, options);
} }
else { else {
resultTemporaryRedirect(req, res, options.destination); resultTemporaryRedirect(req, res, options);
} }
} }

3
js/server/modules/org/arangodb/foxx/manager.js Normal file → Executable file
View File

@ -642,7 +642,8 @@ function routingAalApp (app, mount, options) {
"do" : "org/arangodb/actions/redirectRequest", "do" : "org/arangodb/actions/redirectRequest",
"options" : { "options" : {
"permanently" : (app._id.substr(0,4) !== 'dev'), "permanently" : (app._id.substr(0,4) !== 'dev'),
"destination" : p + defaultDocument "destination" : defaultDocument,
"relative" : true
} }
} }
}); });