X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FAuthentication%2FStore%2FHtpasswd%2FUser.pm;h=ad5d17cc249681256267cf2782a268d203d06921;hb=0fed016a9dac029577ec85b485a0446f7e6507c4;hp=dc2bd834ed44c9fcebaaeb53c00e51d0f1691991;hpb=e8a7c384d5406c197382271ef873bad2883bbaf6;p=catagits%2FCatalyst-Authentication-Store-Htpasswd.git

diff --git a/lib/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm b/lib/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
index dc2bd83..ad5d17c 100644
--- a/lib/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
+++ b/lib/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
@@ -6,39 +6,57 @@ use base qw/Catalyst::Plugin::Authentication::User Class::Accessor::Fast/;
 use strict;
 use warnings;
 
-BEGIN { __PACKAGE__->mk_accessors(qw/file name/) }
+BEGIN { __PACKAGE__->mk_accessors(qw/user store/) }
+
+use overload '""' => sub { shift->id }, fallback => 1;
 
 sub new {
-	my ( $class, $name, $file ) = @_;
+	my ( $class, $store, $user ) = @_;
+
+	return unless $user;
 
-	bless {
-		name => $name,
-		file => $file,
-	}, $class;
+	bless { store => $store, user => $user }, $class;
+}
+
+sub id {
+    my $self = shift;
+    return $self->user->username;
 }
 
 sub supported_features {
 	return {
 		password => {
 			self_check => 1,
-		}
+		},
+		session => 1,
+        roles => 1,
 	};
 }
 
 sub check_password {
 	my ( $self, $password ) = @_;
-
-	return $self->file->htCheckPassword( $self->name, $password );
+	return $self->user->check_password( $password );
 }
 
 sub roles {
 	my $self = shift;
-	split( ",", $self->info_string );
+	my $field = $self->user->extra_info->[0];
+	return defined $field ? split /,/, $field : ();
 }
 
-sub info_string {
+sub for_session {
+    my $self = shift;
+    return $self->id;
+}
+
+sub AUTOLOAD {
 	my $self = shift;
-	$self->file->fetchInfo( $self->name );
+	
+	( my $method ) = ( our $AUTOLOAD =~ /([^:]+)$/ );
+
+	return if $method eq "DESTROY";
+	
+	$self->user->$method;
 }
 
 __PACKAGE__;
@@ -52,11 +70,39 @@ __END__
 Catalyst::Plugin::Authentication::Store::Htpasswd::User - A user object
 representing an entry in an htpasswd file.
 
-=head1 SYNOPSIS
+=head1 DESCRIPTION
 
-	use Catalyst::Plugin::Authentication::Store::Htpasswd::User;
+This object wraps an L<Authen::Htpasswd::User> object. An instance of it will be returned
+by C<< $c->user >> when using L<Catalyst::Plugin::Authentication::Store::Htpasswd>. Methods 
+not defined in this module are passed through to the L<Authen::Htpasswd::User> object. The
+object stringifies to the username.
 
-=head1 DESCRIPTION
+=head1 METHODS
+
+=head2 new($store,$user)
+
+Creates a new object from a store object, normally an instance of 
+L<Catalyst::Plugin::Authentication::Store::Htpasswd::Backend>, and a user object,
+normally an instance of L<Authen::Htpasswd::User>.
+
+=head2 id
+
+Returns the username.
+
+=head2 check_password($password)
+
+Returns whether the password is valid.
+
+=head2 roles
+
+Returns an array of roles, which is extracted from a comma-separated list in the
+third field of the htpasswd file.
+
+=head1 COPYRIGHT & LICENSE
+
+	Copyright (c) 2005 the aforementioned authors. All rights
+	reserved. This program is free software; you can redistribute
+	it and/or modify it under the same terms as Perl itself.
 
 =cut