X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb.pm;h=4a8f77a138844c63a0227e8ca428584bce759aa1;hb=2c514a6fa0b3eed98e8f978a4b1fa24eb7a7457f;hp=b2f68e82e3ea5f175e73fb7a2be3c4cca489a40c;hpb=16562d80c93bb2dac55f7dd45021217d3b7bb6f6;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb.pm b/lib/stemmaweb.pm
index b2f68e8..4a8f77a 100644
--- a/lib/stemmaweb.pm
+++ b/lib/stemmaweb.pm
@@ -23,12 +23,12 @@ use Search::GIN::Extract::Multiplex;
 use Catalyst qw/
     ConfigLoader
     Static::Simple
-    Unicode::Encoding
-    +CatalystX::SimpleLogin
     Authentication
     Session
     Session::Store::File
     Session::State::Cookie
+    StatusMessage
+    StackTrace
 /;
 
 extends 'Catalyst';
@@ -48,6 +48,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',
@@ -67,9 +69,55 @@ __PACKAGE__->config(
             },
             store => {
                 class => 'Model::KiokuDB',
-                model_name => 'User',
+                model_name => 'Directory',
             },
-        }
+        },
+        openid => {
+            credential => {
+                class => 'OpenID',
+                extensions => ['http://openid.net/srv/ax/1.0' => 
+                    {
+                        ns          => 'ax',
+                        uri         => 'http://openid.net/srv/ax/1.0',
+                        mode        => 'fetch_request',
+                        required    => 'email',
+                        'type.email' => 'http://axschema.org/contact/email',
+                        # type        => {
+                        #     email => 'http://axschema.org/contact/email'
+                        # }
+                    }
+                    ],
+            },
+            store => {
+                class => 'Model::KiokuDB',
+                model_name => 'Directory',
+            },
+            auto_create_user => 1,
+        },
+    },
+    ## Auth with CatalystX::Controller::Auth
+    'Controller::Users' => {
+        model => 'User',
+        login_id_field => 'username',
+        login_db_field => 'username',
+        action_after_login => '/users/success',
+        action_after_register => '/users/success', 
+        enable_sending_register_email => 0,
+        register_email_from  => '"Stemmaweb" <stemmaweb@byzantini.st>',
+        register_email_subject => 'Registration to stemmaweb',
+        register_email_template_plain => 'register-plain.tt',
+        realm => 'default',
+        login_fields => { openid => [qw/openid_identifier/],
+                          default => [qw/username password remember/],
+        },
+    },
+    'View::Email::Template' => {
+        stash_key => 'email_template',
+    },
+
+    recaptcha => {
+        pub_key => '6LfR19MSAAAAACy2meHvLfZGRn3PM2rRYIAfh665',
+        priv_key => '6LfR19MSAAAAAMlQb8BdyecWNRE1bAL2YSgz2sah',
     },
 );