[Jifty-commit] r4765 - in jifty/trunk: lib/Jifty/Plugin/Authentication/Password/Action

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun Dec 23 15:22:11 2007
New Revision: 4765

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm

Log:
 r74081 at pinglin:  jesse | 2007-12-23 14:52:22 -0500
 * Made Password Auth plugin able to work with attributes other than 'email address' for autoloading


Modified: jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm	Sun Dec 23 15:22:11 2007
@@ -58,8 +58,7 @@
     my $self  = shift;
     my $email = shift;
 
-    my $u = Jifty->app_class('Model', 'User')->new(current_user => Jifty->app_class('CurrentUser')->superuser);
-    $u->load_by_cols( email => $email );
+    my $u = $self->load_user($email);
     return $self->validation_error(email => _("It doesn't look like there's an account by that name.")) unless ($u->id);
 
     return $self->validation_ok('email');
@@ -131,10 +130,7 @@
 
 sub take_action {
     my $self = shift;
-    my $user = Jifty->app_class('Model', 'User')->new(current_user => Jifty->app_class('CurrentUser')->superuser);
-    $user->load_by_cols( email => $self->argument_value('email') );
-
-
+    my $user = $self->load_user( $self->argument_value('email') );
     my $password = $self->argument_value('password');
     my $token    = $self->argument_value('token') || '';
     my $hashedpw = $self->argument_value('hashed_password');
@@ -169,6 +165,21 @@
     return 1;
 }
 
+=head2 load_user
+
+Load up and return a YourApp::User object for the user trying to log in
+
+=cut
+
+sub load_user {
+    my $self = shift;
+    my $username = shift;
+    my $user = Jifty->app_class('Model', 'User')->new(current_user => Jifty->app_class('CurrentUser')->superuser);
+    $user->load_by_cols( email => $username);
+    return $user
+
+}
+
 =head2 login_message $user_object
 
 Returns the "hi, you're logged in message"