Changeset 37408

Timestamp:

2023-03-05T16:40:18+13:00 (2 weeks ago)

Author:

davidb

Message:

More careful moitoring of login/logout args to avoid ending up with conflicting googleidentity-signin=1 AND logout= present at the same time

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -530 +530 @@
       </xsl:text></xsl:if><xsl:text disable-output-escaping="yes">
 
+        // Need to check for the situation where the user immediately logs out, having just logged in
+    // Given how cgi-args are used, this sequence of use there is still 'googleidentity-signin=1' in the
+    // the URL, which we don't want.
+    var has_googleidentity_signin = (url.indexOf('googleidentity-signin=') >= 0);
+    if (has_googleidentity_signin) {
+        url = url.replace(/(&amp;|\?)googleidentity-signin=\d+(&amp;|$)/g, "$1")
+    }
+        
         var logout_url_action = url + (hasQueryString ? "&amp;" : "?") + "logout=" + (hashPart ? hashPart : "");
     var logout_javascript_call = "javascript:gslogout('"+logout_url_action+"')";
@@ -613 +621 @@
     <xsl:if test="$afterHash != ''">#<xsl:value-of select="$afterHash" /></xsl:if>   
   </xsl:template>
+  
+
+  <xsl:template name="generateGoogleIdentityLoginURL">
+    <xsl:param name="servletProtocol"/>
+    <xsl:param name="baseURL"/>
+    <xsl:param name="redirectURL"/>
+    
+    <xsl:variable name="beforeLogout" select="substring-before($redirectURL, '&amp;amp;logout=')"/>
+    <xsl:variable name="tmpAfter" select="substring-after($redirectURL, '&amp;amp;logout=')"/>
+    <xsl:variable name="afterLogout" select="substring-after($tmpAfter, '&amp;amp;')"/>
+    <xsl:variable name="beforeHash" select="substring-before($redirectURL, '#')"/>
+    <xsl:variable name="afterHash" select="substring-after($redirectURL, '#')"/>
+    <!-- Get rid of any lingering &amp;logout= already in the redirectURL.
+     But retain anything before and after it (the after portion would start with &).
+     Can't use fn:replace() as it's only been defined since XSLT 2.0. We use XSLT 1.x -->
+    <xsl:variable name="baseRedirectURL">
+      <xsl:choose>
+        <xsl:when test="$beforeLogout != ''"><xsl:value-of select="$beforeLogout" /></xsl:when>
+        <xsl:otherwise><xsl:value-of select="$redirectURL" /></xsl:otherwise>
+      </xsl:choose>
+      <xsl:if test="$afterLogout != ''">&amp;<xsl:value-of select="$afterLogout" /></xsl:if>      
+    </xsl:variable>
+
+    <!-- Output the login link: the current page's URL (with any lingering logout suffix removed) 
+     followed by ?{$redirectURL}&googleidentity-signin=1 or &amp;{$redirectURL}&googleidentity-signin=1 followed by any # portion of the current page's URL -->
+    <xsl:value-of select="$servletProtocol"/>
+    <xsl:text>:</xsl:text>
+    <xsl:value-of select="$baseURL"/>
+    <xsl:choose>
+      <xsl:when test="$beforeHash != ''"><xsl:value-of select="$beforeHash" /></xsl:when>
+      <xsl:otherwise><xsl:value-of select="$baseRedirectURL" /></xsl:otherwise>
+    </xsl:choose>
+    <xsl:choose>
+      <xsl:when test="contains($baseRedirectURL, '?')"><xsl:text>&amp;googleidentity-signin=1</xsl:text></xsl:when>
+      <xsl:otherwise><xsl:text>?googleidentity-signin=1</xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="$afterHash != ''">#<xsl:value-of select="$afterHash" /></xsl:if>   
+  </xsl:template>
+  
+
   
   <xsl:template name="LoginoutLink">