Changeset 37627 for main

Timestamp:

2023-04-08T17:42:27+12:00 (13 months ago)

Author:

davidb

Message:

Moving login support with Google sign-in to 'shared-templates.xs'. This is so both login.xsl and authen.xsl can make use of the shared template that implements this.

Location:

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

Files:

• pages/authen.xsl (modified) (2 diffs)
• pages/login.xsl (modified) (4 diffs)
• shared-templates.xsl (modified) (2 diffs)

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

@@ -57 +57 @@
                 <!-- ********** -->
                 <xsl:when test="/page/pageResponse/authenticationNode/service/@operation = 'Login'">
-                  
+
+                        <xsl:call-template name="loginForm">
+                      <xsl:with-param name="action-url">
+                        <xsl:value-of select="$library_name"/>
+                        <xsl:text>/admin/</xsl:text>
+                        <xsl:value-of select="/page/pageRequest/paramList/param[@name = 's1.authpage']/@value" />
+                      </xsl:with-param>
+                    </xsl:call-template>
+                    <!--
                     <form method="POST" action="{$library_name}/admin/{/page/pageRequest/paramList/param[@name = 's1.authpage']/@value}">
                         <table id="loginTable">
@@ -72 +80 @@
                         </xsl:text>
                     </script>
+-->
                 </xsl:when>
 

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

@@ -71 +71 @@
         <br/>
         </xsl:if>
+        <xsl:call-template name="loginForm">
+                  <xsl:with-param name="action-url" select="/page/pageRequest/paramList/param[@name = 'redirectURL']/@value" />
+                </xsl:call-template>
+        <!--
         <form method="POST"
               id="login-form"
@@ -108 +112 @@
                   <td colspan="2">
                     <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="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"
@@ -116 +120 @@
                     <xsl:call-template name="generateGoogleIdentityLoginURL">
                       <xsl:with-param name="servletProtocol" select="$servletProtocol"></xsl:with-param>
-                      <!--<xsl:with-param name="baseURL"         select="$baseURL"></xsl:with-param>-->
+                      < ! - -<xsl:with-param name="baseURL"         select="$baseURL"></xsl:with-param> - - >
                                           <xsl:with-param name="baseURL"         select="$base-href"></xsl:with-param>
                       <xsl:with-param name="redirectURL"     select="$redirectURL"></xsl:with-param>
@@ -192 +196 @@
             </xsl:text>
         </script>
+        -->
     </xsl:template>
 </xsl:stylesheet>

main/trunk/greenstone3/web/interfaces/default/transform/shared-templates.xsl

@@ -4 +4 @@
     xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
     xmlns:gslib="http://www.greenstone.org/skinning"
+    xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
     extension-element-prefixes="java util"
     exclude-result-prefixes="java util">
@@ -190 +191 @@
   </xsl:template>
 
+  <xsl:template name="loginForm">
+    <xsl:param name="action-url"></xsl:param>
+
+    <form method="POST" id="login-form" action="{$action-url}">
+
+      <table id="loginTable">
+    <tr>
+      <td colspan="2">
+        <input type="text" name="username" style="width:95%;" autocomplete="username">
+          <xsl:attribute name="placeholder">
+        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username')"/>
+          </xsl:attribute>
+        </input>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <input type="password" name="password" style="width:95%;" autocomplete="current-password">
+          <xsl:attribute name="placeholder">
+        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password')"/>
+          </xsl:attribute>
+        </input>
+      </td>
+    </tr>
+    <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>
+    </tr>
+    <xsl:if test="$googlesignin_client_id">
+      <tr>
+        <td colspan="2">
+          <div class="hr-with-text">or</div>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <gsf:variable name="serlvetProtocol"><xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name='servlet_protocol']/@value"/></gsf:variable>
+          <gsf:div id="g_id_onload"
+               data-client_id="{$googlesignin_client_id}"
+               data-ux_mode="redirect">
+        <xsl:attribute name="data-login_uri">
+          <xsl:call-template name="generateGoogleIdentityLoginURL">
+            <xsl:with-param name="servletProtocol" select="$servletProtocol"></xsl:with-param>
+            <!--<xsl:with-param name="baseURL"         select="$baseURL"></xsl:with-param>-->
+                    <xsl:with-param name="baseURL"         select="$base-href"></xsl:with-param>
+            <!--<xsl:with-param name="redirectURL"     select="$redirectURL"></xsl:with-param> -->
+            <xsl:with-param name="redirectURL"     select="$action-url"></xsl:with-param>
+          </xsl:call-template>
+          
+        </xsl:attribute>
+        
+        
+          </gsf:div>
+          
+          <gsf:div class="g_id_signin" data-type="standard"/>
+          
+        </td>
+      </tr>
+    </xsl:if>
+    
+      </table>
+    </form>
+
+    <gsf:variable name="googleSigninClientId"><xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'googlesignin_client_id']/@value"/></gsf:variable>
+
+    <gsf:script>
+
+      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 payload;
+            
+      }
+            
+      function googleSigninHandleCredentialResponseUNUSED(response)
+      {
+        console.log("onGoogleSignin() called");
+
+        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);
+
+      }
+
+      $(document).ready(function() {
+          $("#loginTable input[name=\"username\"]").focus();
+      }
+    </gsf:script>
+
+    <!--
+    <script type="text/javascript">
+      <xsl:text disable-output-escaping="yes">
+      {
+          $("#loginTable input[name=\"username\"]").focus();
+      }
+      </xsl:text>
+    </script>
+    -->
+    
+    </xsl:template>
+  
 </xsl:stylesheet>