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

diff --git a/auth/views.py b/auth/views.py
index af7fbc42..d1e78b53 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -2,11 +2,18 @@
 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
+
+from myslice.viewutils import the_user
 
 def login_user(request):
     state = "Please log in below..."
     username = password = ''
+    env={'hard_wired_users':MyCustomBackend.hard_wired_users}
+    
     if request.POST:
         username = request.POST.get('username')
         password = request.POST.get('password')
@@ -15,11 +22,33 @@ 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'] = "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)
+        return render_to_response('view-login.html',env, context_instance=RequestContext(request))
 
-    return render_to_response('login-view.html',{'state':state, 'username': username},
+# 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 ('/')
+    logout(request)
+    return HttpResponseRedirect ('/')
+        
+