Merge branch '6.0/shredder-authtokens' into 6.0-trunk

Author: cbrandtbuffalo

lib/RT/Shredder.pm

@@ -261,6 +261,9 @@ our @SUPPORTED_OBJECTS = qw(
     Dashboard
     DashboardSubscription
     ObjectContent
+    AuthToken
+    Configuration
+    Shortener
 );
 
 =head3 GENERIC

lib/RT/Shredder/Plugin/Users.pm

@@ -292,7 +292,7 @@ sub SetResolvers
         my $resolver = sub {
             my %args = (@_);
             my $t =    $args{'TargetObject'};
-            foreach my $method ( qw(Creator LastUpdatedBy) ) {
+            foreach my $method ( qw(Creator LastUpdatedBy LastAccessedBy) ) {
                 next unless $t->_Accessible( $method => 'read' );
                 if ( $t->__Value($method) == $args{BaseObject}->Id ) {
                     $t->__Set( Field => $method, Value => $uid );

lib/RT/User.pm

@@ -3162,6 +3162,11 @@ sub __DependsOn {
     $objs->Limit( FIELD => 'Field', VALUE => $self->PrincipalObj->id, ENTRYAGGREGATOR => 'AND' );
     push( @$list, $objs );
 
+# Cleanup user's auth tokens
+    $objs = RT::AuthTokens->new( $self->CurrentUser );
+    $objs->LimitOwner( VALUE => $self->Id );
+    push( @$list, $objs );
+
     $deps->_PushDependencies(
         BaseObject => $self,
         Flags => RT::Shredder::Constants::DEPENDS_ON,
@@ -3196,11 +3201,14 @@ sub __DependsOn {
         Tickets
         Transactions
         Users
+        AuthTokens
+        Configurations
+        Shorteners
     );
     my @var_objs;
     foreach( @OBJECTS ) {
         my $class = "RT::$_";
-        foreach my $method ( qw(Creator LastUpdatedBy) ) {
+        foreach my $method ( qw(Creator LastUpdatedBy LastAccessedBy) ) {
             my $objs = $class->new( $self->CurrentUser );
             next unless $objs->RecordClass->_Accessible( $method => 'read' );
             $objs->Limit( FIELD => $method, VALUE => $self->id );

t/shredder/02user.t

@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use Test::Deep;
-use RT::Test::Shredder tests => 10;
+use RT::Test::Shredder tests => undef;
 my $test = "RT::Test::Shredder";
 
 $test->create_savepoint('clean');
@@ -16,21 +16,34 @@ my $ticket = RT::Ticket->new( RT->SystemUser );
 my ($tid) = $ticket->Create( Queue => $qid, Subject => 'test' );
 ok( $tid, "ticket created" );
 
+my $config = RT::Configuration->new( RT->SystemUser );
+ok( $config->Create( Name => 'RememberDefaultQueue', Content => 1 ) );
+
+my $auth_token = RT::AuthToken->new( RT->SystemUser );
+ok( $auth_token->Create( Owner => RT->SystemUser->Id, Description => 'test' ) );
+
+my $shortener = RT::Shortener->new( RT->SystemUser );
+ok( $shortener->Create( Content => 'Query=id>1' ) );
+
 $test->create_savepoint('bucreate'); # berfore user create
 my $user = RT::User->new( RT->SystemUser );
 my ($uid, $msg) = $user->Create( Name => 'new user', Privileged => 1, Disabled => 0 );
 ok( $uid, "created new user" ) or diag "error: $msg";
 is( $user->id, $uid, "id is correct" );
-# HACK: set ticket props to enable VARIABLE dependencies
+# HACK: set props to enable VARIABLE dependencies
 $ticket->__Set( Field => 'LastUpdatedBy', Value => $uid );
+$config->__Set( Field => $_, Value => $uid ) for qw/Creator LastUpdatedBy/;
+$auth_token->__Set( Field => $_, Value => $uid ) for qw/Creator LastUpdatedBy/;
+$shortener->__Set( Field => $_, Value => $uid ) for qw/Creator LastUpdatedBy LastAccessedBy/;
+
 $test->create_savepoint('aucreate'); # after user create
 
 {
     my $resolver = sub {
         my %args = (@_);
         my $t = $args{'TargetObject'};
         my $resolver_uid = RT->SystemUser->id;
-        foreach my $method ( qw(Creator LastUpdatedBy) ) {
+        foreach my $method ( qw(Creator LastUpdatedBy LastAccessedBy) ) {
             next unless $t->_Accessible( $method => 'read' );
             $t->__Set( Field => $method, Value => $resolver_uid );
         }
@@ -53,3 +66,5 @@ $test->create_savepoint('aucreate'); # after user create
     $test->db_is_valid;
     cmp_deeply( $test->dump_current_and_savepoint('aucreate'), "current DB equal to savepoint");
 }
+
+done_testing;