aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorBrett Smith <brettcsmith@brettcsmith.org>2013-03-24 14:44:41 -0400
committerBrett Smith <brettcsmith@brettcsmith.org>2013-03-24 14:44:41 -0400
commitc7424612d7c0447373dce8d69aa5af03aebe08dc (patch)
treea12e638ce3e19d7ae84a37dfea1cb477b19686ab /mediagoblin/app.py
parentbb530c44450b88c3584f4e50119857599e5a5f40 (diff)
downloadmediagoblin-c7424612d7c0447373dce8d69aa5af03aebe08dc.tar.lz
mediagoblin-c7424612d7c0447373dce8d69aa5af03aebe08dc.tar.xz
mediagoblin-c7424612d7c0447373dce8d69aa5af03aebe08dc.zip
Back sessions with It's Dangerous.
This is a contribution to #668.
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 515b5b66..fe8e8c4b 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -25,7 +25,7 @@ from werkzeug.exceptions import HTTPException
from werkzeug.routing import RequestRedirect
from mediagoblin import meddleware, __version__
-from mediagoblin.tools import common, translate, template
+from mediagoblin.tools import common, session, translate, template
from mediagoblin.tools.response import render_http_exception
from mediagoblin.tools.theme import register_themes
from mediagoblin.tools import request as mg_request
@@ -160,7 +160,8 @@ class MediaGoblinApp(object):
## Attach utilities to the request object
# Do we really want to load this via middleware? Maybe?
- request.session = request.environ['beaker.session']
+ session_manager = session.SessionManager()
+ request.session = session_manager.load_session_from_cookie(request)
# Attach self as request.app
# Also attach a few utilities from request.app for convenience?
request.app = self
@@ -229,6 +230,8 @@ class MediaGoblinApp(object):
response = render_http_exeption(
request, e, e.get_description(environ))
+ session_manager.save_session_to_cookie(request.session, response)
+
return response(environ, start_response)
def __call__(self, environ, start_response):