Changeset 38258

Timestamp:

2023-09-30T21:32:17+13:00 (9 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

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (4 diffs)
• gli/src/org/greenstone/gatherer/GathererProg.java (modified) (2 diffs)
• greenstone3/web/interfaces/default/transform/javascript-global-setup.xsl (modified) (1 diff)
• greenstone3/web/interfaces/default/transform/pages/webswing-gli.xsl (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -250 +250 @@
         }
         else if (isWebswing) {
+
+            
             Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX +  Configuration.CONFIG_WEBSWING_XML; 
             Configuration.config_xml = Configuration.CONFIG_WEBSWING_XML;
 
+            String webswing_msg = "username: " + go.username +
+            "\ngroups: " + go.usergroups +
+            "\nuid: " + go.userJSessionID;
             
-            if(go.userJSessionID != null) {
+            JOptionPane.showMessageDialog(null, webswing_msg, "webswing info", JOptionPane.INFORMATION_MESSAGE);
+            /*
+              try {
+              Thread.sleep(5000);
+              } catch(Exception e) {
+              System.err.println("Couldn't sleep for 5000 ms");
+              }*/
+            
+            if(go.username != null && !go.username.equals("")
+               && go.userJSessionID != null && !go.userJSessionID.equals("")) {
+            
+            
             webswingAuthenticator = new WebswingAuthenticator(go.username, go.usergroups, go.userJSessionID);
+            } else { //if(webswingAuthenticator != null) {
+            WebswingAuthenticator.clear();
+            if(webswingAuthenticator != null) {
+                webswingAuthenticator = null;
+            }
             }
+            
         }
         else {      
@@ -2121 +2143 @@
         extends GAuthenticator
     {
-        static protected String username;
+        static protected String username = null;
         static protected HashSet<String> groups;
         static protected String userJSessionID;
         static protected String rawgroups;
+
+        static public void clear() {
+        username = null;
+        groups = null;
+        userJSessionID = null;
+        rawgroups = null;
+        }
 
         protected void displayError(String error_message) {
@@ -2148 +2177 @@
 
         public boolean authenticate(String library_url_string) {
-          if(username == null) {
+        String result;
+        if(username == null) {
         PasswordAuthentication pa = getPasswordAuthentication();
         if (pa == null) {
@@ -2160 +2190 @@
         
         String password = new String(pa.getPassword());
-        String result;
+
         try {
             String new_url = library_url_string+"?a=s&sa=authenticated-ping&excerptid=gs_content&un="+username+"&pw="+password;

main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -31 +31 @@
 import javax.swing.*;
 import org.greenstone.gatherer.util.Utility;
+import org.webswing.toolkit.api.WebswingUtil;
+import java.util.Arrays;
 
 /**
@@ -67 +69 @@
     String gli_user_directory_path = null;
     if (go.webswing) {
+        WebswingUtil.getWebswingApi().sendActionEvent("jsConsoleLog", "args are: " + Arrays.toString(args), null);
+        
         if (go.gsdl3_src_path != null) {
         // above is a (albeit a crude) test at this early stage of running,

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) {