git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attach manifold_session and manifold_person to django's request.session
[myslice.git]
/
auth
/
views.py
diff --git
a/auth/views.py
b/auth/views.py
index
f5db82d
..
45fe637
100644
(file)
--- a/
auth/views.py
+++ b/
auth/views.py
@@
-7,32
+7,39
@@
from django.http import HttpResponseRedirect
from auth.backend import MyCustomBackend
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 = ''
def login_user(request):
state = "Please log in below..."
username = password = ''
- env={'hard_wired_users':MyCustomBackend.hard_wired_users}
-
+ 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')
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)
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:
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:
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'
return render_to_response('view-login.html',env, context_instance=RequestContext(request))
else:
state='Welcome to MySlice'
- env['state']=state; env['username']=''
+ 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 ?
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 ?
@@
-40,7
+47,8
@@
def logout_user (request):
# xxx check that we're indeed logged in
if not request.user.is_authenticated():
return HttpResponseRedirect ('/')
# 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))
+ 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
def do_logout_user (request):
# xxx check that we're indeed logged in