Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / auth / views.py

diff --git a/auth/views.py b/auth/views.py
index f6afa3f..6380cf2 100644 (file)
--- a/auth/views.py
+++ b/auth/views.py
@@ -5,28 +5,30 @@ from django.shortcuts import render_to_response
 from django.contrib.auth import authenticate, login, logout
 from django.http import HttpResponseRedirect
 
-from auth.backend import MyCustomBackend
-
-from myslice.viewutils import the_user
+from myslice.viewutils import topmenu_items, 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,
-         'manifold_url':Config.manifold_url(),
-         }
+    env={
+        '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 ('/portal/dashboard')
+                #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))
@@ -34,21 +36,15 @@ def login_user(request):
             env['state'] = "Your username and/or password were incorrect."
             return render_to_response('view-login.html',env, context_instance=RequestContext(request))
     else:
-        state='Welcome to MySlice'
+        state='' #Welcome to MySlice'
         env['state']=state
         env['username']=the_user(request)
+        env['topmenu_items'] = topmenu_items('', 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 ?
 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
+    # check that we're indeed logged in
     if not request.user.is_authenticated():
         return HttpResponseRedirect ('/')
     logout(request)