Google Sign-On with new libraries

openemr · Sep 22, 2022 · cd882f8 · cd882f8
1 parent 19ff279
commit cd882f8
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/templates/login/login_core.html.twig b/templates/login/login_core.html.twig
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    {% if displayGoogleSignin %}
+        <meta name="google-signin-client_id" content="{{ googleSigninClientID|attr }}">
+    {% endif %}
    <script src="https://accounts.google.com/gsi/client" async defer></script>
     <div id="g_id_onload"
          data-client_id="{{ googleSigninClientID }}"
@@ -9,8 +12,8 @@
 
     <title>{{ title|text }} {{ "Login"|xlt }}</title>
     {% block head %}{% endblock %}
-    <script src="{{ webroot|attr }}/interface/product_registration/product_registration_service.js?v={{ assetVersion|attr }}"></script>
-    <script src="{{ webroot|attr }}/interface/product_registration/product_registration_controller.js?v={{ assetVersion|attr }}"></script>
+    <script src="{{ webroot|attr }}/interface/product_registration/product_registration_service.js?v={{ assetVersion|attr_url }}"></script>
+    <script src="{{ webroot|attr }}/interface/product_registration/product_registration_controller.js?v={{ assetVersion|attr_url }}"></script>
     {{ setupHeader() }}
     <script type="text/javascript">
         const registrationTranslations = {{ regTranslations }};
@@ -213,7 +216,6 @@
     // if the button was clicked (otherwise we would automatically login)
     function onSignInSuccess(googleUser) {
         
-    //        const auth_response = googleUser.getAuthResponse();
             const id_token = googleUser.credential;
             $('.login-failure').hide();
             $('#used-google-signin').val(true);
@@ -252,13 +254,6 @@
             $('#standard-auth-username, #standard-auth-password').show();
         });
     }
-/*
-    $.getScript('https://accounts.google.com/gsi/client', function (data, textStatus, jqxh) {
-        // When the auth2 library is loaded, log out so the user has to sign into google
-        // Render the "Sign in with Google" button
-        renderButton();
-    }).fail(function (jqxhr, settings, exception) {
-        $('#google-signin-service-unreachable-alert').show();
-    }); */
+
 </script>
 {% endif %}