X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=skyquake%2Fframework%2Fcore%2Fmodules%2Froutes%2Fnavigation.js;h=16ff25af5a1c7f7698da6cf8cfaa540282ac517c;hb=b584e4b139ec4a30a97ea42ff54c76753731d707;hp=9b8fbf7ecadb3a625469ec03ef6574654aa744d9;hpb=5a83ca0dc3306b54e1db18b9e05e860fed21324e;p=osm%2FUI.git

diff --git a/skyquake/framework/core/modules/routes/navigation.js b/skyquake/framework/core/modules/routes/navigation.js
index 9b8fbf7ec..16ff25af5 100644
--- a/skyquake/framework/core/modules/routes/navigation.js
+++ b/skyquake/framework/core/modules/routes/navigation.js
@@ -1,6 +1,6 @@
 
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,12 +44,12 @@ Router.get('/login.html', cors(), function(req, res) {
 
 Router.get('/', cors(), function(req, res) {
 	var api_server = req.query['api_server'] || (req.protocol + '://' + configurationAPI.globalConfiguration.get().api_server);
-	if (req.session.loggedIn) {
+	if (req.session && req.session.loggedIn) {
 		console.log('Logged in. Redirect to launchpad')
 		res.redirect('/launchpad/?api_server=' + api_server + '&upload_server=' + req.protocol + '://' + (configurationAPI.globalConfiguration.get().upload_server || req.hostname));
 	} else {
 		console.log('Redirect to login.html');
-		res.redirect('login.html?api_server=' + api_server);
+		res.redirect('login.html?api_server=' + api_server + '&upload_server=' + req.protocol + '://' + (configurationAPI.globalConfiguration.get().upload_server || req.hostname));
 	}
 });