Changeset 35331

Timestamp:

2021-09-04T16:25:30+12:00 (3 years ago)

Author:

davidb

Message:

Further refinement of the Google Signin process from the JS/Web Browser side of things

Location:

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

Files:

• layouts/header.xsl (modified) (2 diffs)
• pages/login.xsl (modified) (3 diffs)

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

@@ -97 +97 @@
     function gslogout(logout_action_url) {
       if (googlesignin_client_id != '') {
-        googleSignout();
+        googleLogout();
       }
       window.location = logout_action_url;
@@ -187 +187 @@
     function googleSigninInit() {
       gapi.load('auth2', function() {
-        auth2 = gapi.auth2.init({
+        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 googleSignout() {
+    function googleLogout() {
       var auth2 = gapi.auth2.getAuthInstance();
-      auth2.signOut().then(function () {
+      // 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");
       });

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

@@ -56 +56 @@
             </xsl:text>
       </gsf:style>
-      
+
+        <gsf:variable name="loginErrorMessage"><xsl:value-of select="/page/pageRequest/paramList/param[@name = 'loginMessage']/@value"/></gsf:variable>
+
+        <!--
         <xsl:if test="/page/pageRequest/paramList/param[@name = 'loginMessage']/@value">
-            <div id="gs_error" class="ui-state-error ui-corner-all">
-                <span class="ui-icon ui-icon-alert" style="float: left;"><xsl:text> </xsl:text></span><xsl:value-of select="/page/pageRequest/paramList/param[@name = 'loginMessage']/@value"/>
-            </div>
+        -->
+        <xsl:if test="$loginErrorMessage != ''">
+          <div id="gs_error" class="ui-state-error ui-corner-all">
+            <span class="ui-icon ui-icon-alert" style="float: left;">
+              <xsl:text> </xsl:text>
+            </span>
+            <xsl:value-of select="$loginErrorMessage"/>
+          </div>
         <br/>
         </xsl:if>
@@ -126 +134 @@
           function onGoogleSigninFailure(error)
           {
-            console.error(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',
@@ -142 +163 @@
           }
 
-          window.onload = function()  {
+          function optGoogleAuth2InitCallback() {
             if (gs.variables['googleSigninClientId']) {
+              // Only trigger the Google Signin button if a client-id has been set in servlet.xml           
               renderButton();
             }