[Catalyst-commits] r13125 - in Catalyst-Authentication-Store-LDAP/trunk: . lib/Catalyst/Authentication/Store lib/Catalyst/Authentication/Store/LDAP

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2010-04-03 03:57:52 +0100 (Sat, 03 Apr 2010)
New Revision: 13125

Modified:
   Catalyst-Authentication-Store-LDAP/trunk/Changes
   Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm
   Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
   Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm
Log:
patch against RT #51505

Modified: Catalyst-Authentication-Store-LDAP/trunk/Changes
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/Changes	2010-04-02 18:27:33 UTC (rev 13124)
+++ Catalyst-Authentication-Store-LDAP/trunk/Changes	2010-04-03 02:57:52 UTC (rev 13125)
@@ -1,9 +1,14 @@
-0.1007  19 Mar 2010
+1.008  xxx
+   - Allow for multiple uid values on a User object. See RT
+     https://rt.cpan.org/Ticket/Display.html?id=51505
+     and patch from Andrew Kirkpatrick.
+
+1.007  19 Mar 2010
    - Store the user password for the ldap_connection method in an inside
      out hash rather than a closure so that the user object can be serialized
      with Storable as people are putting them in the session (RT#53279)
 
-0.1006  11 Dec 2009
+1.006  11 Dec 2009
    - Pass $c along to find_user method so overridden user_class users can
      get at models (or whatever crazy things they might do) (gphat)
    - Add an ldap_connection method to the user class, which will return

Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm	2010-04-02 18:27:33 UTC (rev 13124)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm	2010-04-03 02:57:52 UTC (rev 13125)
@@ -72,7 +72,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.007';
+our $VERSION = '1.008';
 
 use Catalyst::Authentication::Store::LDAP::User;
 use Net::LDAP;

Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm	2010-04-02 18:27:33 UTC (rev 13124)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm	2010-04-03 02:57:52 UTC (rev 13125)
@@ -50,7 +50,7 @@
 use warnings;
 use Scalar::Util qw/refaddr/;
 
-our $VERSION = '1.007';
+our $VERSION = '1.008';
 
 BEGIN { __PACKAGE__->mk_accessors(qw/user store/) }
 
@@ -111,8 +111,8 @@
         return $string;
     }
     else {
-        my ($string) = $self->$userfield;
-        return $string;
+        my $val = $self->$userfield;
+        return ref($val) eq 'ARRAY' ? $val->[0] : $val;
     }
 }
 

Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm	2010-04-02 18:27:33 UTC (rev 13124)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm	2010-04-03 02:57:52 UTC (rev 13125)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.007';
+our $VERSION = '1.008';
 
 use Catalyst::Authentication::Store::LDAP::Backend;