Changeset 38258 for main/trunk/greenstone3/web

Timestamp:

2023-09-30T21:32:17+13:00 (8 months ago)

Author:

anupama

Message:

I think I have webswing gli authentication working out without an authentication popup when the user is also logged in through greenstone, without breaking existing functionality. I still can't work out why the WebswingAuthenticator has static members and yet a proper constructor is called. This commit contains debug statements. Added a webswing javascript function that Java can call for debugging statements going into the browser's console using console.log, called jsConsoleLog.

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• javascript-global-setup.xsl (modified) (1 diff)
• pages/webswing-gli.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/javascript-global-setup.xsl

@@ -167 +167 @@
               if (typeof gs.userInformation === "undefined") {
                 gs.userInformation={};
-            gs.userInformation.username = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@username"/><xsl:text disable-output-escaping="yes">";
-            gs.userInformation.groups = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@groups"/><xsl:text disable-output-escaping="yes">";
               }
+              gs.userInformation.username = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@username"/><xsl:text disable-output-escaping="yes">";
+              gs.userInformation.groups = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@groups"/><xsl:text disable-output-escaping="yes">";
+              
               gs.userInformation.uid = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@uid"/><xsl:text disable-output-escaping="yes">";              
             </xsl:text>

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-gli.xsl

@@ -100 +100 @@
       </div>
 
-  <gsf:script>
+      <gsf:script>
+console.log("username " +  gs.userInformation.username);
+console.log("groups " +  gs.userInformation.groups);
+console.log("uid " +  gs.userInformation.uid);
+
     var webswingInstance0 = {
         options: {
@@ -123 +127 @@
             $('#webswing-gli').css("cursor",cursor_type);           
         }
+        else if (actionName == "jsConsoleLog") {
+            console.log("Got message from java:\n" + data);
+        }
           }
             }
@@ -132 +139 @@
        webswingInstance0.options.args = "-load " + gs.cgiParams.c + "/gli.col";
        }
-       if(gs.userInformation.uid) {
-         webswingInstance0.options.args = " -username " + gs.userInformation.username;
-         webswingInstance0.options.args = " -groups " + gs.userInformation.groups.replace(/\s/g, '');
-         webswingInstance0.options.args = " -uid " + gs.userInformation.uid;
+       if(gs.userInformation.username &amp;&amp; gs.userInformation.uid) { // true if defined and not empty string etc
+       // doing "args +=" adds "undefined" parameter iff it's first argument attached to webswing customArgs
+       // This then has the effect of switching of the previous argument, -webswing
+         if (gs.cgiParams.c) {
+           webswingInstance0.options.args += " -username " + gs.userInformation.username;
+     } else {
+       webswingInstance0.options.args = "-username " + gs.userInformation.username;
+     }
+         webswingInstance0.options.args += " -groups " + gs.userInformation.groups.replace(/\s/g, '');
+         webswingInstance0.options.args += " -uid " + gs.userInformation.uid;
        }
     function getParam(name) {