var _ = require('lodash');
var base64 = require('base-64');
var APIVersion = '/v2';
+var configurationAPI = require('./configuration');
function logAndReject(mesg, reject) {
res.errorMessage = {
}
function logAndRedirectToLogin(mesg, res, req) {
+ var api_server = req.query['api_server'] || (req.protocol + '://' + configurationAPI.globalConfiguration.get().api_server);
+ var upload_server = req.protocol + '://' + (configurationAPI.globalConfiguration.get().upload_server || req.hostname);
console.log(mesg);
- res.redirect('login.html?api_server=' + req.query['api_server']);
+ res.redirect('login.html?api_server=' + api_server + '&upload_server=' + upload_server);
res.end();
}
return new Promise(function(resolve, reject) {
if (req.session && req.session.loggedIn == true) {
req.session.projectId = req.params.projectId;
- var successMsg = 'Added project' + projectId + ' to session' + req.sessionID;
+ var successMsg = 'Added project' + req.session.projectId + ' to session' + req.sessionID;
console.log(successMsg);
return resolve ({