X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fsrc%2Fauth%2Flogin.tt;h=1d1a6c2fc2aab5056f28489372bafb7240371b65;hb=c2ab34976078af676adcf006768f6ebf350d2cfb;hp=61575b1103ecb2e92a609703ac68f4eb0d07aee7;hpb=eb38afbcd0ef1e20b95b9954a0b8d0f107d0c342;p=scpubgit%2Fstemmaweb.git

diff --git a/root/src/auth/login.tt b/root/src/auth/login.tt
index 61575b1..1d1a6c2 100644
--- a/root/src/auth/login.tt
+++ b/root/src/auth/login.tt
@@ -18,7 +18,38 @@ $(document).ready(function() {
     	}, 2000 );
     }
 });
+
+	function googleSignIn(authResult) {
+		if (authResult['status']['signed_in']) {
+			document.getElementById('signinButton').setAttribute('style', 'display:none');
+			gapi.client.load('plus', 'v1', function apiClientLoaded() {
+				gapi.client.plus.people.get({ userId: 'me'}).execute(function infoRetrieved(resp) {
+					var primaryEmail;
+					for (var i = 0; i < resp.emails.length; i++) {
+						if (resp.emails[i].type === 'account') {
+							primaryEmail = resp.emails[i].value;
+						}
+					}
+
+					dataRetrieved(authResult, primaryEmail);
+				});
+			});
+		} else {
+			console.log("Error", authResult);
+		}
+	}
+
+	function dataRetrieved(login, email) {
+		console.log(email);
+		console.log(login.id_token);
+
+		document.getElementById('email').value = email;
+		document.getElementById('id_token').value = login.id_token;
+		document.getElementById('google_form').submit();
+	}
+
     </script>
+	<script src="https://apis.google.com/js/client:platform.js" async defer></script>
 [% END %]
 	<div id="topbanner">
 		<h1>Stemmaweb - Sign in</h1>
@@ -47,20 +78,31 @@ $(document).ready(function() {
 	<h3><a href="#">Sign in with Google</a></h3>
 	<div>
 		<p>If you have a Google account, you may use it to sign into Stemmaweb.</p>
-		<form method="post" action="[% c.uri_for_action('/users/login') | html %]" autocomplete="off">
-			<input type="hidden" name="realm" value="openid"/>
-			<input type="hidden" name="openid_identifier" value="https://www.google.com/accounts/o8/id"/>
-			<input type="submit" class="login_button" id="#login_google" value="Sign in with Google"></input>
+		<span id="signinButton">
+			<span
+			class="g-signin"
+			data-callback="googleSignIn"
+			data-clientid="577442226093-pi2ud795g49ibip78bgfoabhl4kdrguc.apps.googleusercontent.com"
+			data-cookiepolicy="single_host_origin"
+			data-requestvisibleactions="http://schema.org/AddAction"
+			data-scope="https://www.googleapis.com/auth/plus.profile.emails.read"
+			data-openidrealm="http://sherlock.scsys.co.uk:3000/"
+			>
+			</span>
+		</span>
+		<form id="google_form" action="[% c.uri_for_action('/users/login') | html %]" method="post">
+			<input id='email' name='email' value='' type='hidden' />
+			<input id='id_token' name='id_token' value='' type='hidden' />
 		</form>
 	</div>
 
 	<h3><a href="#">Sign in with OpenID</a></h3>
 	<div>
 		<p>If you have an account with an <a href="http://openid.net/get-an-openid/" target="_blank">OpenID provider</a> (e.g. WordPress, Blogger, Flickr, Yahoo), you may use it to sign into Stemmaweb.
-		<form method="post" action="[% c.uri_for_action('/users/login') | html %]" autocomplete="off">
+		<form class="openid_form" method="post" action="[% c.uri_for_action('/users/login') | html %]" autocomplete="off">
 			<input type="hidden" name="realm" value="openid"/>
-			<input type="text" name="openid_identifier"/>
-			<input type="submit" class="login_button" id="#login_openid" value="Sign in with OpenID"/>
+			<input type="text" name="openid_identifier" id="openid_input"/>
+			<input type="submit" class="login_button" id="login_openid" value="Sign in with OpenID"/>
 		</form>
 	</div>
 
@@ -84,4 +126,4 @@ $(document).ready(function() {
 [% END %]
 </div>
 [% END %]
-[% PROCESS footer.tt %]
\ No newline at end of file
+[% PROCESS footer.tt %]