nicer and simpler logout

[myslice.git] / auth / views.py

diff --git a/auth/views.py b/auth/views.py
index f6afa3f..c26bc1d 100644 (file)
--- a/auth/views.py
+++ b/auth/views.py
@@ -14,19 +14,22 @@ def login_user(request):
     state = "Please log in below..."
     username = password = ''
     env={'hard_wired_users':MyCustomBackend.hard_wired_users,
-         'manifold_url':Config.manifold_url(),
+         '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)
                 #state = "You're successfully logged in!"
-                return HttpResponseRedirect ('/')
+                return HttpResponseRedirect ('/login-ok')
             else:
                 env['state'] = "Your account is not active, please contact the site admin."
                 return render_to_response('view-login.html',env, context_instance=RequestContext(request))
@@ -41,13 +44,6 @@ def login_user(request):
 
 # hard question : where should we redirect requests to logout if user is not logged in ?
 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',{'username':the_user(request)},
-                              context_instance=RequestContext(request))
-
-def do_logout_user (request):
     # xxx check that we're indeed logged in
     if not request.user.is_authenticated():
         return HttpResponseRedirect ('/')