X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FSession%2FState%2FCookie.pm;h=5319500777eee36932d5978945459e48c58d049a;hp=01f9dce9640332ce0014012b43c5c9064561d3b0;hb=fc4b9d6d856e4a7571309881c4f7cd4b1d445642;hpb=00fa6d616f7d92c777970491971588bd791018e6

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 01f9dce..5319500 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -5,6 +5,7 @@ use strict;
 use warnings;
 
 use NEXT;
+use Catalyst::Utils ();
 
 our $VERSION = "0.02";
 
@@ -12,7 +13,8 @@ sub setup_session {
     my $c = shift;
 
     $c->NEXT::setup_session(@_);
-    $c->config->{session}{cookie_name} ||= Catalyst::Utils::appprefix( $c ) . '_session';
+    $c->config->{session}{cookie_name}
+        ||= Catalyst::Utils::appprefix($c) . '_session';
 }
 
 sub finalize_cookies {
@@ -40,16 +42,29 @@ sub make_session_cookie {
         ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
     };
 
+    $cookie->{expires}=$c->calc_expiry();
+
+    $cookie->{secure} = 1 if $cfg->{cookie_secure};
+
+    return $cookie;
+}
+
+sub calc_expiry {
+    my $c=shift;
+    my $cfg    = $c->config->{session};
+    my $value= $c->NEXT::calc_expiry(@_);
+    return $value if $value;
     if ( exists $cfg->{cookie_expires} ) {
-        if ( my $ttl = $cfg->{cookie_expires} ) {
-            $cookie->{expires} = time() + $ttl;
-        }    # else { cookie is non-persistent }
+        if ( $cfg->{cookie_expires} > 0 ) {
+            return time() + $cfg->{cookie_expires};
+        }
+        else {
+            return undef;
+        }
     }
     else {
-        $cookie->{expires} = $c->session->{__expires};
+       return $c->session_expires;
     }
-
-    return $cookie;
 }
 
 sub prepare_cookies {
@@ -76,7 +91,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::Plugin::Session::State::Cookie - A session ID 
+Catalyst::Plugin::Session::State::Cookie - Maintain session IDs using cookies.
 
 =head1 SYNOPSIS
 
@@ -134,6 +149,16 @@ The name of the cookie to store (defaults to C<Catalyst::Utils::apprefix($c) . '
 
 The name of the domain to store in the cookie (defaults to current host)
 
+=item cookie_expires
+
+Number of seconds from now you want to elapse before cookie will expire. 
+Set to 0 to create a session cookie, ie one which will die when the 
+user's browser is shut down.
+
+=item cookie_secure
+
+If this attribute set true, the cookie will only be sent via HTTPS.
+
 =back
 
 =head1 CAVEATS