From: Errietta Kostala <errietta@errietta.me>
Date: Wed, 21 Jan 2015 16:55:52 +0000 (+0000)
Subject: Rename url to public_cert_url and use app url for realm
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=82be740cdfb5d03a0de50c3f8d6ec74dbcf692a9;p=scpubgit%2Fstemmaweb.git

Rename url to public_cert_url and use app url for realm
---

diff --git a/lib/stemmaweb/Authentication/Credential/Google.pm b/lib/stemmaweb/Authentication/Credential/Google.pm
index 07a3c5f..056082b 100644
--- a/lib/stemmaweb/Authentication/Credential/Google.pm
+++ b/lib/stemmaweb/Authentication/Credential/Google.pm
@@ -90,7 +90,7 @@ Decoded JSON object containing certificates.
 sub retrieve_certs {
     my ($self, $url) = @_;
 
-    $url ||= ( $self->{_app}->config->{'Authentication::Credential::Google'}->{url} || 'https://www.googleapis.com/oauth2/v1/certs' );
+    $url ||= ( $self->{_app}->config->{'Authentication::Credential::Google'}->{public_cert_url} || 'https://www.googleapis.com/oauth2/v1/certs' );
     return decode_json(get($url));
 }
 
diff --git a/root/src/auth/login.tt b/root/src/auth/login.tt
index 1d1a6c2..fd60478 100644
--- a/root/src/auth/login.tt
+++ b/root/src/auth/login.tt
@@ -86,7 +86,7 @@ $(document).ready(function() {
 			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/"
+			data-openidrealm="[% c.uri_for('/') %]"
 			>
 			</span>
 		</span>
diff --git a/stemmaweb.conf b/stemmaweb.conf
index 0425d7b..8857908 100644
--- a/stemmaweb.conf
+++ b/stemmaweb.conf
@@ -11,5 +11,5 @@ name = stemmaweb
     dsn dbi:SQLite:dbname=db/traditions.db
 </Model>
 <Authentication::Credential::Google>
-    url https://www.googleapis.com/oauth2/v1/certs
+    public_cert_url https://www.googleapis.com/oauth2/v1/certs
 </Authentication::Credential::Google>