X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=104d11c9162c1a848480496e68ac5774356b4757;hb=253c727bf8b4f874ae9488a1393acc5bcbbeae37;hp=45fe637823939d3283801414bf4bd42416508a35;hpb=bbdf40b4dd1bebc81461f1c9294aca95323bf889;p=myslice.git

diff --git a/auth/views.py b/auth/views.py
index 45fe6378..104d11c9 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -1,59 +1,12 @@
-# Create your views here.
-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, logout
+from django.contrib.auth import logout
 from django.http import HttpResponseRedirect
 
-from auth.backend import MyCustomBackend
-
-from myslice.viewutils import 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(),
-         }
-
-    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(token=token)
-        if user is not None:
-            if user.is_active:
-                login(request, user)
-                #state = "You're successfully logged in!"
-                return HttpResponseRedirect ('/')
-            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))
-        else:
-            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))
-
 # 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 ('/')
+    print "LOGGING OUT"
     logout(request)
     return HttpResponseRedirect ('/')