X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=9d718504dc38df1a113d86b40b259720677bd4e3;hb=89b5d553be498ec100b9403746951140e68994be;hp=817fb631ffb3b6fa621d7ba90da17dbc6ecf869f;hpb=20028a8cc2b83ed3c8d98218958ebd34bc75f891;p=myslice.git

diff --git a/auth/views.py b/auth/views.py
index 817fb631..9d718504 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -2,7 +2,7 @@
 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 auth.backend import MyCustomBackend
@@ -20,17 +20,31 @@ def login_user(request):
         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 ('/')
             else:
-                state = "Your account is not active, please contact the site admin."
-                env['state']=state; env['username']=username
+                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']=state; env['username']=username
+            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']=''
         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',{},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 ('/')
+    logout(request)
+    return HttpResponseRedirect ('/')
+        
+