X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb.pm;h=1a9da7ded5b1fe35504f998c1ca574f9928a3bd2;hb=40d56e641d7c1dc0722f8e521e711b3ab5a81650;hp=7b52ebdfe19e1ad4fd6d5c5ded523e79e9f2d1a3;hpb=bec03a85acc04f8738bccb9e11d0331e0559ddea;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb.pm b/lib/stemmaweb.pm
index 7b52ebd..1a9da7d 100644
--- a/lib/stemmaweb.pm
+++ b/lib/stemmaweb.pm
@@ -23,7 +23,6 @@ use Search::GIN::Extract::Multiplex;
 use Catalyst qw/
     ConfigLoader
     Static::Simple
-    Unicode::Encoding
     Authentication
     Session
     Session::Store::File
@@ -34,6 +33,8 @@ use Catalyst qw/
 
 extends 'Catalyst';
 
+use stemmaweb::Authentication::FormHandler;
+
 our $VERSION = '0.01';
 
 # Configure the application.
@@ -49,6 +50,8 @@ __PACKAGE__->config(
     name => 'stemmaweb',
     # Disable deprecated behavior needed by old applications
     disable_component_resolution_regex_fallback => 1,
+    # Set Unicode as the default
+    encoding => 'UTF-8',
     default_view => 'TT',
 	'View::JSON' => {
 		expose_stash => 'result',
@@ -93,9 +96,20 @@ __PACKAGE__->config(
             },
             auto_create_user => 1,
         },
+        google => {
+            credential => {
+                class => '+stemmaweb::Authentication::Credential::Google',
+            },
+            store => {
+                class => 'Model::KiokuDB',
+                model_name => 'Directory',
+            },
+            auto_create_user => 1,
+        },
     },
     ## Auth with CatalystX::Controller::Auth
     'Controller::Users' => {
+        form_handler => 'stemmaweb::Authentication::FormHandler',
         model => 'User',
         login_id_field => 'username',
         login_db_field => 'username',
@@ -108,6 +122,7 @@ __PACKAGE__->config(
         realm => 'default',
         login_fields => { openid => [qw/openid_identifier/],
                           default => [qw/username password remember/],
+                          google => [qw/email id_token/],
         },
     },
     'View::Email::Template' => {