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

Timestamp:

2023-03-02T23:09:46+13:00 (14 months ago)

Author:

davidb

Message:

Changes related to shifting to the new GoogleIdentity API; also some tweaks to whitespace and tag-name construction using lower-case rather than uppercase tag names

File:

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

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

@@ -113 +113 @@
     function gslogout(logout_action_url) {
       if (googlesignin_client_id != '') {
-        googleLogout();
+        //googleLogout();
+        console.log("Need to implement new Google Identiy Logout function?????");
       }
       window.location = logout_action_url;
@@ -208 +209 @@
 
   <xsl:template name="addGoogleSignOn">    
-    <meta name="google-signin-client_id" content="{$googlesignin_client_id}" />
-    
-    <script>
-      <xsl:text disable-output-escaping="yes">
-    
-    function googleSigninInit() {
-      gapi.load('auth2', function() {
-        var auth2 = gapi.auth2.init({
-           client_id: googlesignin_client_id,
-           //scope: 'email' // don't need to top up 'profile' with 'email' as not used client side (email is retrieved via GS3 Servlet)
-         })
-         .then(function() {      
-           if (typeof optGoogleAuth2InitCallback === "function"){
-             optGoogleAuth2InitCallback();
-           }
-         });
-      });
-    }
-         
-    function googleLogout() {
-      var auth2 = gapi.auth2.getAuthInstance();
-      // Use 'disconnect()' rather than 'signOut()' as this does a deeper logout
-      // that revokes the user's "Google granted" permission.
-      // This makes it easier, when using the same browser, to login into Greenstone3
-      // using a differeng Google sign-in account
-
-      auth2.disconnect().then(function () {
-        console.log("Google-authenticated User signed out");
-      });
-      return false;
-    }
-      </xsl:text>
-    </script>
-    <script src="https://apis.google.com/js/platform.js?onload=googleSigninInit" async="async" defer="defer" ><xsl:text> </xsl:text></script>
+    <meta name="google-signin-client_id--DEPRECATED" content="{$googlesignin_client_id}" />
+    <script src="https://accounts.google.com/gsi/client" async="async" defer="defer" ><xsl:text> </xsl:text></script>
     
   </xsl:template>
@@ -486 +455 @@
     else
     {
-    menu = $("&lt;UL&gt;")
+    menu = $("&lt;ul&gt;")
     .css("position", "absolute")
     .css("display", "block")
@@ -523 +492 @@
     var editingLink = $("&lt;a&gt;")
     .attr("href", "javascript:;");
-    var editingButton = $("&lt;LI&gt;")
+    var editingButton = $("&lt;li&gt;")
     .addClass("ui-state-default")
     .css("padding", "3px")</xsl:text>
@@ -558 +527 @@
       .attr("href", logout_javascript_call);
     
-    var logoutButton = $("&lt;LI&gt;")
+    var logoutButton = $("&lt;li&gt;")
       .css("padding", "3px")
       .html("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'menu.logout')"/><xsl:text disable-output-escaping="yes">")
@@ -599 +568 @@
     <xsl:value-of select="@value"/>
       </xsl:if>
-    </xsl:for-each>
-    
+    </xsl:for-each>    
   </xsl:template>
 
@@ -609 +577 @@
     <xsl:variable name="url" select="/page/pageRequest/@fullURL"/>
     <xsl:variable name="beforeLogout" select="substring-before($url, '&amp;amp;logout=')"/>
-    <xsl:variable name="tmpAfter" select="substring-after($url, '&amp;amp;logout=')"/>
-    <xsl:variable name="afterLogout" select="substring-after($tmpAfter, '&amp;amp;')"/>
+    <xsl:variable name="tmpAfter" select="substring-after($url, '&amp;amp;logout=')"/>
+    <xsl:variable name="afterLogout" select="substring-after($tmpAfter, '&amp;amp;')"/>
     <xsl:variable name="beforeHash" select="substring-before($url, '#')"/>
     <xsl:variable name="afterHash" select="substring-after($url, '#')"/>