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=b0e18ddc4601435eba2bb84161b02c1aea6b8cfa;hp=f1aaa8db77161040e223de63fea64e4f55086380;hb=db1cda22b4b70937a8fd6f3c105082985baacce7;hpb=19c2baa1eebb6a6d4d16d427c5e169f1efb5dfe2

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index f1aaa8d..b0e18dd 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -9,28 +9,47 @@ use NEXT;
 our $VERSION = "0.01";
 
 sub setup_session {
-	my $c = shift;
+    my $c = shift;
 
-	$c->NEXT::setup_session(@_);
+    $c->NEXT::setup_session(@_);
 
-	$c->config->{session}{cookie_name} ||= "session";
+    $c->config->{session}{cookie_name} ||= "session";
 }
 
-sub finalize {
+sub finalize_cookies {
     my $c = shift;
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    if ( $c->sessionid) {
+		$c->update_session_cookie( $c->make_session_cookie );
+	}
 
-    if ( my $sid = $c->sessionid ) {
-        my $cookie = $c->request->cookies->{$cookie_name};
-        if ( !$cookie or $cookie->value ne $sid ) {
-            $c->response->cookies->{$cookie_name} = { value => $sid };
-            $c->log->debug(qq/A cookie with the session id "$sid" was saved/)
-              if $c->debug;
-        }
-    }
+    return $c->NEXT::finalize_cookies(@_);
+}
+
+sub update_session_cookie {
+	my ( $c, $updated ) = @_;
+    my $cookie_name = $c->config->{session}{cookie_name};
+	$c->response->cookies->{$cookie_name} = $updated;
+}
+
+sub make_session_cookie {
+	my $c = shift;
 
-    return $c->NEXT::finalize(@_);
+	my $cfg = $c->config->{session};
+	my $cookie = {
+		value   => $c->sessionid,
+		($cfg->{cookie_domain} ? (domain => $cfg->{cookie_domain}) : ()),
+	};
+
+	if ( exists $cfg->{cookie_expires} ) {
+		if ( my $ttl = $cfg->{cookie_expires} ) {
+			$cookie->{expires} = time() + $ttl;
+		} # else { cookie is non-persistent }
+	} else {
+		$cookie->{expires} = $c->session->{__expires};
+	}
+
+	return $cookie;
 }
 
 sub prepare_cookies {
@@ -38,7 +57,7 @@ sub prepare_cookies {
 
     my $ret = $c->NEXT::prepare_cookies(@_);
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    my $cookie_name = $c->config->{session}{cookie_name};
 
     if ( my $cookie = $c->request->cookies->{$cookie_name} ) {
         my $sid = $cookie->value;
@@ -46,7 +65,7 @@ sub prepare_cookies {
         $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug;
     }
 
-	return $ret;
+    return $ret;
 }
 
 __PACKAGE__
@@ -61,7 +80,7 @@ Catalyst::Plugin::Session::State::Cookie - A session ID
 
 =head1 SYNOPSIS
 
-	use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
+    use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
 
 =head1 DESCRIPTION
 
@@ -78,7 +97,7 @@ This plugin stores the session ID on the client using the cookie mechanism.
 
 Will restore if an appropriate cookie is found.
 
-=item finalize
+=item finalize_cookies
 
 Will set a cookie called C<session> if it doesn't exist or if it's value is not
 the current session id.
@@ -97,8 +116,26 @@ Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 The name of the cookie to store (defaults to C<session>).
 
+=item cookie_domain
+
+The name of the domain to store in the cookie (defaults to current host)
+
 =back
 
+=item CAVEATS
+
+Sessions have to be created before the first write to be saved. For example:
+
+	sub action : Local {
+		my ( $self, $c ) = @_;
+		$c->res->write("foo");
+		$c->session( ... );
+		...
+	}
+
+Will cause a session ID to not be set, because by the time a session is
+actually created the headers have already been sent to the client.
+
 =head1 SEE ALSO
 
 L<Catalyst>, L<Catalyst::Plugin::Session>.