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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun Dec 23 20:01:20 2007
New Revision: 4766

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/ClassLoader.pm
   jifty/trunk/lib/Jifty/Model/Metadata.pm
   jifty/trunk/lib/Jifty/Model/Session.pm
   jifty/trunk/lib/Jifty/Model/SessionCollection.pm
   jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm
   jifty/trunk/lib/Jifty/Record.pm
   jifty/trunk/lib/Jifty/Web.pm

Log:
 r74084 at pinglin:  jesse | 2007-12-23 19:59:49 -0500
 * Misc current_user cleanups to deal with issues unmasked by RT on Jifty


Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm	(original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm	Sun Dec 23 20:01:20 2007
@@ -402,7 +402,7 @@
 
     require Jifty::Model::ModelClassCollection;
     require Jifty::Model::ModelClass;
-    my $models = Jifty::Model::ModelClassCollection->new(current_user => Jifty::CurrentUser->superuser);
+    my $models = Jifty::Model::ModelClassCollection->new(current_user => Jifty->app_class('CurrentUser')->superuser);
     $models->unlimit();
     while (my $model = $models->next) {
         $model->instantiate();

Modified: jifty/trunk/lib/Jifty/Model/Metadata.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Model/Metadata.pm	(original)
+++ jifty/trunk/lib/Jifty/Model/Metadata.pm	Sun Dec 23 20:01:20 2007
@@ -57,7 +57,7 @@
 
 sub load {
     my $self = shift;
-    $self = $self->new( current_user => Jifty::CurrentUser->superuser )
+    $self = $self->new( current_user => Jifty->app_class('CurrentUser')->superuser )
         unless ref $self;
     return undef unless $self->_handle and $self->_handle->dbh->ping;
 
@@ -83,7 +83,7 @@
 
 sub store {
     my $self = shift;
-    $self = $self->new( current_user => Jifty::CurrentUser->superuser )
+    $self = $self->new( current_user => Jifty->app_class('CurrentUser')->superuser )
         unless ref $self;
 
     my ( $key, $value ) = @_;

Modified: jifty/trunk/lib/Jifty/Model/Session.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Model/Session.pm	(original)
+++ jifty/trunk/lib/Jifty/Model/Session.pm	Sun Dec 23 20:01:20 2007
@@ -58,7 +58,7 @@
 
 =cut
 
-sub current_user { return Jifty::CurrentUser->superuser }
+sub current_user { return Jifty->app_class('CurrentUser')->superuser }
 
 =head2 new_session_id
 

Modified: jifty/trunk/lib/Jifty/Model/SessionCollection.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Model/SessionCollection.pm	(original)
+++ jifty/trunk/lib/Jifty/Model/SessionCollection.pm	Sun Dec 23 20:01:20 2007
@@ -29,6 +29,6 @@
 
 =cut
 
-sub current_user { return Jifty::CurrentUser->superuser }
+sub current_user { return Jifty->app_class('CurrentUser')->superuser }
 
 1;

Modified: jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm	Sun Dec 23 20:01:20 2007
@@ -36,7 +36,7 @@
 
     my $email = $self->argument_value('email');
     my $class = Jifty->app_class('Model','User');
-    my $user = $class->new(current_user => Jifty::CurrentUser->superuser);
+    my $user = $class->new(current_user => Jifty->app_class('CurrentUser')->superuser);
     $user->load_by_cols(email => $email);
     unless($user->id) {
         $self->result->error('No such user');

Modified: jifty/trunk/lib/Jifty/Record.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Record.pm	(original)
+++ jifty/trunk/lib/Jifty/Record.pm	Sun Dec 23 20:01:20 2007
@@ -435,11 +435,13 @@
         # Otherwise, no instruction from the handlers, move along...
     }
 
-    # Abort! Return false for safety
+    # Abort! Return false for safety if the hook exploded
     else {
         return 0;
     }
 
+
+    Carp::confess unless ( $self->current_user );
     if (   $self->current_user->is_bootstrap_user
         or $self->current_user->is_superuser )
     {

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Sun Dec 23 20:01:20 2007
@@ -246,21 +246,22 @@
         $self->_current_user( $currentuser_obj || undef );
     }
 
+    my $object;
+
     if ( defined $self->temporary_current_user ) {
         return $self->temporary_current_user;
     } elsif ( defined $self->_current_user ) {
         return $self->_current_user;
-
     } elsif ( my $id = $self->session->get('user_id') ) {
-        my $object = Jifty->app_class("CurrentUser")->new( id => $id );
-        $self->_current_user($object);
-        return $object;
+         $object = Jifty->app_class("CurrentUser")->new( id => $id );
+    } elsif ( Jifty->config->framework('AdminMode')) {
+         $object = Jifty->app_class("CurrentUser")->superuser;
     } else {
-        my $object = Jifty->app_class("CurrentUser")->new;
-        $object->is_superuser(1) if Jifty->config->framework('AdminMode');
-        $self->_current_user($object);
-        return ($object);
+         $object = Jifty->app_class("CurrentUser")->new;
     }
+    
+    $self->_current_user($object);
+    return $object;
 }
 
 =head3 temporary_current_user [USER]
@@ -758,7 +759,7 @@
         local $self->{navigation} = undef;
         local $self->{page_navigation} = undef;
         $self->replace_current_region($page);
-        Jifty::Dispatcher::_abort;
+        Jifty::Dispatcher::_abort();
         return;
     }
 
@@ -790,7 +791,7 @@
 
     # Mason abort, or dispatcher abort out of here
     $self->mason->abort if $self->mason;
-    Jifty::Dispatcher::_abort;
+    Jifty::Dispatcher::_abort();
 }
 
 =head3 caller