Merge 'better_model_integration' into 'trunk'

r27890@omni (orig r10888):  t0m | 2009-07-15 11:16:11 +0100
Brush up this patch to something more sensible and documented

diff --combined lib/Catalyst/Authentication/Store/LDAP/User.pm
index 69d2c33,9f82980..d7018f4
--- 1/lib/Catalyst/Authentication/Store/LDAP/User.pm
--- 2/lib/Catalyst/Authentication/Store/LDAP/User.pm
+++ b/lib/Catalyst/Authentication/Store/LDAP/User.pm
@@@ -49,28 -49,26 +49,28 @@@ use base qw( Catalyst::Authentication::
  use strict;
  use warnings;
  
 -our $VERSION = '0.1004';
 +our $VERSION = '0.1005';
  
- BEGIN { __PACKAGE__->mk_accessors(qw/user store _ldap_connection/) }
+ BEGIN { __PACKAGE__->mk_accessors(qw/user store _ldap_connection_password/) }
  
  use overload '""' => sub { shift->stringify }, fallback => 1;
  
  =head1 METHODS
  
 -=head2 new($store, $user)
 +=head2 new($store, $user, $c)
  
  Takes a L<Catalyst::Authentication::Store::LDAP::Backend> object
  as $store, and the data structure returned by that class's "get_user"
 -method as $user.
 +method as $user.  The final argument is an instance of your application,
 +which is passed along for those wanting to subclass User and perhaps use
 +models for fetching data.
  
  Returns a L<Catalyst::Authentication::Store::LDAP::User> object.
  
  =cut
  
  sub new {
 -    my ( $class, $store, $user ) = @_;
 +    my ( $class, $store, $user, $c ) = @_;
  
      return unless $user;
  
@@@ -147,9 -145,9 +147,9 @@@ sub check_password 
              $self->roles($ldap);
          }
          # Stash a closure which can be used to retrieve the connection in the users context later.
-         $self->_ldap_connection( sub {
-             $self->store->ldap_bind( undef, $self->ldap_entry->dn, $password )
-         });
+         $self->_ldap_connection_password( sub { $password } ); # Close over
+             # password to try to ensure it doesn't come out in debug dumps
+             # or get serialized into sessions etc..
          return 1;
      }
      else {
@@@ -234,6 -232,22 +234,22 @@@ sub has_attribute 
      }
  }
  
+ =head2 ldap_connection
+ 
+ Re-binds to the auth store with the credentials of the user you logged in
+ as, and returns a L<Net::LDAP> object which you can use to do further queries.
+ 
+ =cut
+ 
+ sub ldap_connection {
+     my $self = shift;
+     my $msg = $self->store->ldap_bind( undef, $self->ldap_entry->dn,
+         $self->_ldap_connection_password->() );
+     $msg->code && die("Error whilst re-binding as " . $self->ldap_entry->dn
+         . " after auth: " . $msg->error . " (" . $msg->code . ")");
+     return $self->store;
+ }
+ 
  =head2 AUTOLOADed methods
  
  We automatically map the attributes of the underlying L<Net::LDAP::Entry>