X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=6380cf2de1453df6786d51ea1bd70588ac38e9ef;hb=71c5af2da6325002d0418468ebe9a1c2036a8549;hp=af7fbc421de8534f8fabd2f2c8381973382006f6;hpb=b0137a4f50050ca3256f1f9fbe2e29713db78958;p=myslice.git

diff --git a/auth/views.py b/auth/views.py
index af7fbc42..6380cf2d 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -2,24 +2,52 @@
 from django.core.context_processors import csrf
 from django.template import RequestContext
 from django.shortcuts import render_to_response
-from django.contrib.auth import authenticate, login
+from django.contrib.auth import authenticate, login, logout
+from django.http import HttpResponseRedirect
+
+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={
+        '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!"
+                #state = "You're successfully logged in!"
+                return HttpResponseRedirect ('/portal/dashboard')
+                #return HttpResponseRedirect ('/login-ok')
             else:
-                state = "Your account is not active, please contact the site admin."
+                env['state'] = "Your account is not active, please contact the site admin."
+                return render_to_response('view-login.html',env, context_instance=RequestContext(request))
         else:
-            state = "Your username and/or password were incorrect."
+            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'
+        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):
+    # check that we're indeed logged in
+    if not request.user.is_authenticated():
+        return HttpResponseRedirect ('/')
+    logout(request)
+    return HttpResponseRedirect ('/')
+        
 
-    return render_to_response('login-view.html',{'state':state, 'username': username},
-                              context_instance=RequestContext(request))