From ce01e50ec17762752ae350af210372f1454ca8bb Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Wed, 29 Jan 2020 00:00:49 +0200
Subject: [PATCH] Attempt to fix google signin #2

---
 views/includes/external.pug | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/views/includes/external.pug b/views/includes/external.pug
index dcbb4fd..4b9dce6 100644
--- a/views/includes/external.pug
+++ b/views/includes/external.pug
@@ -21,7 +21,7 @@
 			}(document, 'script', 'facebook-jssdk'));
 		fb:login-button(scope="public_profile,email", onlogin="checkLoginState();" data-max-rows="1", data-size="large", data-button-type="login_with", data-show-faces="false", data-auto-logout-link="false", data-use-continue-as="false")
 	if auth.google
-		script(src="https://apis.google.com/js/platform.js?onload=startApp")
+		script(src="https://apis.google.com/js/platform.js", async, defer)
 		a.login-btn.google-login.float-lg-right
 			i.fab.fa-fw.fa-google
 			span Log in With Google
@@ -34,8 +34,11 @@
 						client_id: '#{auth.google}',
 						cookie_policy: 'single_host_origin',
 						fetch_basic_profile: true
+					}).then(function () {
+						attachSignin(document.querySelector('.google-login'));
+					}, function (e) {
+						console.error(e);
 					});
-					attachSignin(document.querySelector('.google-login'));
 				});
 			};
 
@@ -57,6 +60,8 @@
 						alert('Failed to log you in using Google.');
 					});
 			}
+
+			startApp();
 	if auth.twitter
 		a.login-btn.twitter-login.login-dialog-pop.float-lg-right(href="/api/external/twitter/login")
 			i.fab.fa-fw.fa-twitter