Changeset 35331 for main/trunk/greenstone3/web/interfaces/default/transform/layouts

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

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (2 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");
       });