Changeset 37391

Timestamp:

2023-03-02T23:09:46+13:00 (3 weeks 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

Location:

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

Files:

• layouts/header.xsl (modified) (7 diffs)
• pages/login.xsl (modified) (5 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, '#')"/>

main/trunk/greenstone3/web/interfaces/default/transform/pages/login.xsl

@@ -11 +11 @@
 
     <!-- use the 'main' layout -->
-    <xsl:include href="layouts/main.xsl"/>
+    <xsl:import href="layouts/main.xsl"/>
 
     <!-- set page title -->
@@ -48 +48 @@
 input.gsloginform[type=submit] {
     float: right;
-    margin-right: 10px;
+    margin-right: 3px;
     margin-top: 5px;
     width: 80px;
@@ -95 +95 @@
               <tr>
                 <td colspan="2">
+                  <input name="googleidentity-signin" type="hidden" value="0" />
                   <input type="submit" class="gsloginform"><xsl:attribute name="value"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'login_b')"/></xsl:attribute></input>
                 </td>
@@ -106 +107 @@
                 <tr>
                   <td colspan="2">
-                    <input type="hidden" id="googlesignin_id_token" name="googlesignin_id_token"></input>
-                    <gsf:div id="mygoogle-signin2" />
+                    <gsf:variable name="serlvetProtocol"><xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name='servlet_protocol']/@value"/></gsf:variable>
+                    <gsf:variable name="baseURL"><xsl:value-of select="/page/pageRequest/@baseURL"/></gsf:variable>
+                    <gsf:variable name="redirectURL"><xsl:value-of select="/page/pageRequest/paramList/param[@name = 'redirectURL']/@value"/></gsf:variable>
+                    <gsf:div id="g_id_onload"
+                         data-client_id="{$googlesignin_client_id}"
+                         data-ux_mode="redirect"
+                         data-login_uri="{$servletProtocol}:{$baseURL}{$redirectURL}&amp;googleidentity-signin=1">
+                    </gsf:div>
+                    <gsf:div class="g_id_signin" data-type="standard"/>
+                    
                   </td>
                 </tr>
@@ -114 +123 @@
             </table>
         </form>
-        
+
         <gsf:variable name="googleSigninClientId"><xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'googlesignin_client_id']/@value"/></gsf:variable>
 
         <gsf:script>
-             
-          function onGoogleSigninSuccess(googleUser)
+
+          function decodeJwtResponse(jwt) {
+            // Split the JWT into its three parts
+            var parts = jwt.split('.');
+
+            // Decode the header and payload parts using base64
+            var header = JSON.parse(atob(parts[0]));
+            var payload = JSON.parse(atob(parts[1]));
+
+            // Return an object containing the decoded header and payload
+            //return {
+            //  header: header,
+            //  payload: payload
+            //};
+            return payload;
+            
+          }
+            
+          function googleSigninHandleCredentialResponseUNUSED(response)
           {
+            console.log("onGoogleSignin() called");
 
-             var google_fullname = googleUser.getBasicProfile().getName();
+            const responsePayload = decodeJwtResponse(response.credential);
+
+            console.log("ID: " + responsePayload.sub);
+            console.log('Full Name: ' + responsePayload.name);
+            console.log('Given Name: ' + responsePayload.given_name);
+            console.log('Family Name: ' + responsePayload.family_name);
+            console.log("Image URL: " + responsePayload.picture);
+            console.log("Email: " + responsePayload.email);
+            console.log("Email verified: " + responsePayload.email_verified);
+
+
+             var google_fullname = responsePayload.name;
              console.log('Google-authenicated login as: ' + google_fullname);
 
-             var googlesignin_id_token = googleUser.getAuthResponse().id_token;
-             //console.log('Google ID Token: ' + googlesignin_id_token);
+             //var googlesignin_id_token = googleUser.getAuthResponse().id_token;
+             // //console.log('Google ID Token: ' + googlesignin_id_token);
 
-             $("#googlesignin_id_token").val(googlesignin_id_token);
-             $("#login-form").submit();
-          }
+             // $("#googlesignin_id_token").val(googlesignin_id_token);
+             // $("#login-form").submit();
 
-          function onGoogleSigninFailure(error)
-          {
-             console.error(error);
-             $("#googlesignin_id_token").val("");
-          }
-
-          function renderButton()
-          {
-            var auth2 = gapi.auth2.getAuthInstance();
-            if ((gs.variables.loginErrorMessage != "") &amp;&amp; auth2.isSignedIn.get()) {
-
-              // IF a Greenstone-login error is being shown on the page (loginErrorMessage)
-              // AND Google logged-in (isSignedIn)
-              // => THEN need to trigger a Google-logout, otherwise the
-              //    the block of code below automatically tiggers a login
-              //    attempt (using the Google credentials), which (if allowed to
-              //    happen) then sets up a endless loop of login attempts
-              googleLogout();
-            }
-          
-             gapi.signin2.render('mygoogle-signin2', {
-               'scope': 'profile email',
-               'width': 240,
-               'height': 50,
-               'longtitle': true,
-               'theme': 'dark',
-               'onsuccess': onGoogleSigninSuccess,
-               'onfailure': onGoogleSigninFailure
-             });
-          }
-
-          function optGoogleAuth2InitCallback() {
-            if (gs.variables['googleSigninClientId']) {
-              // Only trigger the Google Signin button if a client-id has been set in servlet.xml           
-              renderButton();
-            }
+            
           }