X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fframework%2Fcore%2Fmodules%2Fapi%2Fsessions.js;h=ca8669b45807967748a915b3ff7022cc39138391;hp=9583241a4706949ba8cbf42922804df7f1b36f9b;hb=407555cd9dac9e0dd9889da18082ae275a0a44fd;hpb=56e55f5efc98e32a1afb3d99d07e9e5b0847a258

diff --git a/skyquake/framework/core/modules/api/sessions.js b/skyquake/framework/core/modules/api/sessions.js
index 9583241a4..ca8669b45 100644
--- a/skyquake/framework/core/modules/api/sessions.js
+++ b/skyquake/framework/core/modules/api/sessions.js
@@ -46,7 +46,7 @@ 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=' + api_server + '&upload_server=' + upload_server);
+    res.redirect('login.html?api_server=' + api_server + '&upload_server=' + upload_server + '&referer=' + encodeURIComponent(req.headers.referer));
     res.end();
 }
 
@@ -96,19 +96,26 @@ sessionsAPI.create = function(req, res) {
             } else {
                 // go through projects and get list of projects that this user belongs to.
                 // pick first one as default project?
-
+                var isLCM = false;
                 var projects = JSON.parse(results[1].body).collection['rw-project:project'];
                 projects && projects.map(function(project) {
                     project['project-config'] &&
                     project['project-config']['user'] &&
                     project['project-config']['user'].map(function(user) {
                         if (user['user-name'] == username) {
-                            project_list_for_user.push(project.name);
+                            project_list_for_user.push(project);
+                            user['rw-project-mano:mano-role'] && user['rw-project-mano:mano-role'].map(function(role) {
+                                if(role.role.indexOf('rw-project-mano:lcm') > -1) {
+                                    isLCM = true;
+                                }
+                            })
                         }
                     });
                 });
-
-                req.session.projectId = (project_list_for_user.length > 0) && project_list_for_user.sort() && project_list_for_user[0];
+                if (project_list_for_user.length > 0) {
+                    req.session.projectId = project_list_for_user.sort() && project_list_for_user[0].name;
+                    req.session.isLCM = isLCM;
+                }
             }
 
             req.session.authorization = authorization_header_string;
@@ -117,6 +124,7 @@ sessionsAPI.create = function(req, res) {
                 username: username,
                 // project: req.session.projectId
             };
+            req.session.redirect = true;
             var successMsg = 'User => ' + username + ' successfully logged in.';
             successMsg += req.session.projectId ? 'Project => ' + req.session.projectId + ' set as default.' : '';
 
@@ -175,6 +183,7 @@ sessionsAPI.delete = function(req, res) {
     var api_server = req.query["api_server"];
     var uri = utils.confdPort(api_server);
     var url = uri + '/api/logout';
+    req.returnTo = req.headers.referer;
     return new Promise(function(resolve, reject) {
         Promise.all([
             rp({