Changeset 38256 for main/trunk/greenstone3/web

Timestamp:

2023-09-29T20:52:00+13:00 (8 months ago)

Author:

anupama

Message:

Untested. Committing changes for bypassing webswing authentication when already logged in to greenstone.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/javascript-global-functions.js (modified) (1 diff)
• transform/javascript-global-setup.xsl (modified) (2 diffs)
• transform/pages/webswing-gli.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

@@ -616 +616 @@
 }
 
+
+gs.funcions.getLoggedInUser = function()
+{
+    var baseURL = gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=CurrentUser&";
+}
+
 // Prepare the payload (data package) to transmit to metadataserver.pl over AJAX.
 // These next 2 functions prepare both the URL version of the payload and the data object version 

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

@@ -161 +161 @@
             </script>
         </xsl:if>
+        <!-- check if we have a JSessionID and fill in any user details we haven't captured in JS vars yet as well as JSessionID -->
+        <xsl:if test="/page/pageRequest/userContext/@uid">
+          <script type="text/javascript">
+            <xsl:text disable-output-escaping="yes">
+              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.uid = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@uid"/><xsl:text disable-output-escaping="yes">";              
+            </xsl:text>
+          </script>
+        </xsl:if>
     </xsl:template>
     
@@ -167 +180 @@
         <script type="text/javascript" src="interfaces/{$interface_name}/js/GSMetadata.js"><xsl:text> </xsl:text></script>
         <script type="text/javascript" src="interfaces/{$interface_name}/js/utility_scripts.js"><xsl:text> </xsl:text></script>
-
     </xsl:template>
 </xsl:stylesheet>

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

@@ -132 +132 @@
        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;
+       }
     function getParam(name) {
         name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");