use warnings;
use Authen::TypeKey;
-use Carp ();
use File::Spec;
use Catalyst::Utils ();
use NEXT;
use UNIVERSAL::require;
+use Scalar::Util ();
-our $VERSION = '0.1';
+our $VERSION = '0.2';
sub setup {
my $c = shift;
my $config = $c->config->{authentication}{typekey} ||= {};
$config->{typekey_object} ||= do {
- $config->{user_class} ||=
- "Catalyst::Plugin::Authentication::User::Hash";
+ ( $config->{user_class} ||=
+ "Catalyst::Plugin::Authentication::User::Hash" )->require;
$config->{key_cache} ||=
File::Spec->catfile( Catalyst::Utils::class2tempdir( $c, 1 ),
my $typekey = Authen::TypeKey->new;
- for (grep { exists $config->{$_} } qw/expires key_cache key_url token version skip_expiry_check/) {
+ for ( grep { exists $config->{$_} }
+ qw/expires key_cache key_url token version skip_expiry_check/ )
+ {
$typekey->$_( $config->{$_} );
}
sub authenticate_typekey {
my ( $c, @p ) = @_;
- my $p = @p ? { @p } : undef;
+
+ my ( $user, $p );
+ if ( @p == 1 ) {
+ if ( Scalar::Util::blessed( $p[0] ) ) {
+ $user = $p[0];
+ Catalyst::Exception->throw(
+ "Attempted to authenticate user object, but "
+ . "user doesnt't support 'typekey_credentials'" )
+ unless $user->supports(qw/typekey_credentials/);
+ $p = $user->typekey_credentials;
+ }
+ else {
+ $p = $p[0];
+ }
+ }
+ else {
+ $p = @p ? {@p} : undef;
+ }
my $config = $c->config->{authentication}{typekey};
my $typekey = $p && delete( $p->{typekey_object} )
|| $config->{typekey_object};
- $p ||= $c->req;
-
- if ( my $res = $typekey->verify( $p ) ) {
+ $p ||= $c->req;
+
+ if ( my $res = $typekey->verify($p) ) {
$c->log->debug("Successfully authenticated user '$res->{name}'.")
if $c->debug;
- my $user;
-
- if ( my $store = $config->{auth_store} || $c->default_auth_store ) {
+ if ( !$user and my $store = $config->{auth_store} ) {
$store = $c->get_auth_store($store) unless ref $store;
$user = $store->get_user( $p, $res );
}
- else {
+
+ if ( !$user ) {
my $user_class = $config->{user_class};
- $user_class->require or die $@;
- $user = $user_class->new( $res );
+ $user = $user_class->new($res);
}
$c->set_authenticated($user);
else {
$c->log->debug(
sprintf "Failed to authenticate user '%s'. Reason: '%s'",
- $p->{name} || $p->param("name"), $typekey->errstr )
+ $p->{name} || $p->param("name"),
+ $typekey->errstr
+ )
if $c->debug;
return;
L<Authen::TypeKey/verify>, and C<$result_of_verify> is the value returned by
L<Authen::TypeKey/verify>.
+If this is unset, L<Catalyst::Plugin::Authentication/default_auth_store> will
+be used instead.
+
=item user_class
-If C<auth_store> is not set it will use this class to instantiate an object,
-calling C<new> on the class with the same C<$parameters> hash ref.
+If C<auth_store> or the default store returns nothing from get_user, this class
+will be used to instantiate an object by calling C<new> on the class with the
+return value from L<Authen::TypeKey/verify>.
=back