django session bundling manifold auth, person and expires

[myslice.git] / auth / views.py

diff --git a/auth/views.py b/auth/views.py
index 9d71850..45fe637 100644 (file)
--- a/auth/views.py
+++ b/auth/views.py
@@ -7,16 +7,24 @@ from django.http import HttpResponseRedirect
 
 from auth.backend import MyCustomBackend
 
+from myslice.viewutils import the_user
+from myslice.config import Config
+
 def login_user(request):
     state = "Please log in below..."
     username = password = ''
-    env={'hard_wired_users':MyCustomBackend.hard_wired_users}
-    
+    env={'hard_wired_users':MyCustomBackend.hard_wired_users,
+         'manifold_url':Config.manifold_url(),
+         }
+
     if request.POST:
         username = request.POST.get('username')
         password = request.POST.get('password')
+        
+        # pass request within the token, so manifold session key could be attached to the request session.
+        token = {'username': username, 'password': password, 'request': request}    
 
-        user = authenticate(username=username, password=password)
+        user = authenticate(token=token)
         if user is not None:
             if user.is_active:
                 login(request, user)
@@ -30,7 +38,8 @@ def login_user(request):
             return render_to_response('view-login.html',env, context_instance=RequestContext(request))
     else:
         state='Welcome to MySlice'
-        env['state']=state; env['username']=''
+        env['state']=state
+        env['username']=the_user(request)
         return render_to_response('view-login.html',env, context_instance=RequestContext(request))
 
 # hard question : where should we redirect requests to logout if user is not logged in ?
@@ -38,7 +47,8 @@ def logout_user (request):
     # xxx check that we're indeed logged in
     if not request.user.is_authenticated():
         return HttpResponseRedirect ('/')
-    return render_to_response('view-logout.html',{},context_instance=RequestContext(request))
+    return render_to_response('view-logout.html',{'username':the_user(request)},
+                              context_instance=RequestContext(request))
 
 def do_logout_user (request):
     # xxx check that we're indeed logged in