my $sid = $c->sessionid;
+ my $session_data = $c->_session;
if (%$flash_data) {
- $c->store_session_data( "flash:$sid", $flash_data );
+ $session_data->{__flash} = $flash_data;
}
else {
- $c->delete_session_data("flash:$sid");
+ delete $session_data->{__flash};
}
+ $c->_session($session_data);
+ $c->_save_session;
}
}
$c->_tried_loading_flash_data(1);
if ( my $sid = $c->sessionid ) {
- if ( my $flash_data = $c->_flash
- || $c->_flash( $c->get_session_data("flash:$sid") ) )
+
+ my $session_data = $c->session;
+ $c->_flash($session_data->{__flash});
+
+ if ( my $flash_data = $c->_flash )
{
$c->_flash_key_hashes({ map { $_ => Object::Signature::signature( \$flash_data->{$_} ) } keys %$flash_data });
This method is used to invalidate a session. It takes an optional parameter
which will be saved in C<session_delete_reason> if provided.
+NOTE: This method will B<also> delete your flash data.
+
=item session_delete_reason
This accessor contains a string with the reason a session was deleted. Possible
use strict;
use warnings;
-use Test::More tests => 8;
+use Test::More tests => 12;
use Test::MockObject::Extends;
use Test::Exception;
+use Test::Deep;
my $m;
BEGIN { use_ok( $m = "Catalyst::Plugin::Session" ) }
return $key =~ /expire/ ? time() + 1000 : $flash;
},
);
+$c->mock("debug" => sub { 0 });
$c->mock("store_session_data" => sub { $flash = $_[2] });
$c->mock("delete_session_data" => sub { $flash = {} });
$c->set_always( _sessionid => "deadbeef" );
$c->set_always( config => { session => { expires => 1000 } } );
$c->set_always( stash => {} );
+is_deeply( $c->session, {}, "nothing in session" );
+
is_deeply( $c->flash, {}, "nothing in flash" );
$c->flash->{foo} = "moose";
is_deeply( $c->flash, { foo => "moose" }, "one key in flash" );
+cmp_deeply( $c->session, { __updated => re('^\d+$'), __flash => $c->flash }, "session has __flash with flash data" );
+
$c->flash(bar => "gorch");
is_deeply( $c->flash, { foo => "moose", bar => "gorch" }, "two keys in flash" );
+cmp_deeply( $c->session, { __updated => re('^\d+$'), __flash => $c->flash }, "session still has __flash with flash data" );
+
$c->finalize;
is_deeply( $c->flash, { bar => "gorch" }, "one key in flash" );
is_deeply( $c->flash, {}, "nothing in flash after finalize after clear_flash" );
+cmp_deeply( $c->session, { __updated => re('^\d+$'), }, "session has empty __flash after clear_flash + finalize" );
+
$c->flash->{bar} = "gorch";
$c->config->{session}{flash_to_stash} = 1;