Plumb return from novnc for autologin case - should just return to lo…

…go page, not full main page

web-portal/client/js/main.js

@@ -113,7 +113,7 @@ window.addEventListener('load', (event) => {
             dlg.showModal();
         }
     }
-    if(isAutoLogin) startSession("interlisp");
+    if(isAutoLogin && (! fromvnc)) startSession("interlisp");
 });
 
 function startSession (interlispOrXterm) {
@@ -182,6 +182,7 @@ function startSession (interlispOrXterm) {
                                     + `&rooms=${runRooms || "false"}`
                                     + `&sftp=${startSftp || "false"}`
                                     + `&exec=${medleyExec || "inter"}`
+                                    + ( isAutoLogin ? "&autologin" : "")
                                 );
                             }
                         );
@@ -198,6 +199,7 @@ function startSession (interlispOrXterm) {
                             + `&rooms=${runRooms || "false"}`
                             + `&sftp=${startSftp || "false"}`
                             + `&exec=${medleyExec || "inter"}`
+                            + ( isAutoLogin ? "&autologin" : "")
                             );
                     }
                 },

web-portal/client/novnc_oio/ui.js

@@ -1161,7 +1161,10 @@ const UI = {
         //
         // UI.openControlbar();
         // UI.openConnectPanel();
-        window.location.assign(window.location.origin + "/main?fromvnc=1");
+        if(document.location.href.match(/autologin/))
+            window.location.assign(window.location.origin + "/main?fromvnc=1&autologin=1");
+        else
+            window.location.assign(window.location.origin + "/main?fromvnc=1");
     },
 
     securityFailed(e) {

web-portal/server/js/medley.js

@@ -272,6 +272,7 @@ function goToVnc(req, res, next) {
     var url = `/client/go?target=${req.oioTarget}&port=${req.oioPort}&autoconnect=1&view_only=0`;
     url = `${url}${config.supportHttps ? "&encrypt=1" : ""}&u=${req.user.uname}&p=${req.sftpPwd}`;
     if(config.isNCO(req)) url = `${url}&nco=1`;
+    if(req.query.autologin != undefined) url = `${url}&autologin=1`;
     res.redirect(url);
 }