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
simplified manifold config (one url will do just fine)
[myslice.git]
/
auth
/
views.py
diff --git
a/auth/views.py
b/auth/views.py
index
d1e78b5
..
6490ef5
100644
(file)
--- a/
auth/views.py
+++ b/
auth/views.py
@@
-8,22
+8,28
@@
from django.http import HttpResponseRedirect
from auth.backend import MyCustomBackend
from myslice.viewutils import the_user
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)
#state = "You're successfully logged in!"
if user is not None:
if user.is_active:
login(request, user)
#state = "You're successfully logged in!"
- return HttpResponseRedirect ('/')
+ return HttpResponseRedirect ('/
login-ok
')
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 account is not active, please contact the site admin."
return render_to_response('view-login.html',env, context_instance=RequestContext(request))