EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix problem created by refactor

pull/1/head
eric 2013-12-02 18:19:11 -05:00
parent 02103a8a29
commit 79ea81a5e1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraryauth/backends.py
View File

@ -39,7 +39,7 @@ class ip:
return False
class authenticator():
def process(authenticator, success_url, deny_url):
def process(self, caller, success_url, deny_url):
return HttpResponseRedirect(deny_url)
form = None
@ -54,17 +54,17 @@ class cardnum:
return False
class authenticator():
def process(self, authenticator, success_url, deny_url):
if authenticator.form and authenticator.request.method=='POST' and authenticator.form.is_valid():
library = authenticator.form.cleaned_data['library']
library.credential = authenticator.form.cleaned_data['credential']
logger.info('%s authenticated for %s from %s'%(authenticator.request.user, authenticator.library, authenticator.form.cleaned_data.get('number')))
library.add_user(authenticator.form.cleaned_data['user'])
def process(self, caller, success_url, deny_url):
if caller.form and caller.request.method=='POST' and caller.form.is_valid():
library = caller.form.cleaned_data['library']
library.credential = caller.form.cleaned_data['credential']
logger.info('%s authenticated for %s from %s'%(caller.request.user, caller.library, caller.form.cleaned_data.get('number')))
library.add_user(caller.form.cleaned_data['user'])
return HttpResponseRedirect(success_url)
else:
return render(authenticator.request, 'libraryauth/library.html', {
'library':authenticator.library,
'authenticator':authenticator,
return render(caller.request, 'libraryauth/library.html', {
'library':caller.library,
'authenticator':caller,
})
class admin_form(forms.ModelForm):
@ -113,7 +113,7 @@ class email:
return False
class authenticator():
def process(authenticator, success_url, deny_url):
def process(self, caller, success_url, deny_url):
return HttpResponseRedirect(deny_url)
form = None
class admin_form(forms.ModelForm):

4
libraryauth/views.py
View File

@ -67,7 +67,7 @@ class Authenticator:
self.backend_class=getattr(backends,self.library.backend)
form_class = self.backend_class.form
if form_class:
self.form = form_class(request, library, *args, **kwargs)
self.form = form_class(request, self.library, *args, **kwargs)
else:
self.form = None
@ -84,7 +84,7 @@ class Authenticator:
return superlogin(self.request, extra_context={'library':self.library}, template_name='libraryauth/library_login.html')
else:
return self.backend_class.authenticator().process(success_url, deny_url)
return self.backend_class.authenticator().process(self, success_url, deny_url)
def allowed(self):
return self.backend_class.authenticate(self.request, self.library)