public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add backend argument to login_user functions because there are two backends

Browse source
This commit is contained in:
Jonathan Math 2020-07-03 02:20:42 -04:00
parent d3c63d2a6b
commit 524045fdf6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/api/views.py
View file

@ -37,7 +37,7 @@ def login(request):
if form.errors:
errors = form.errors
if form.is_valid():
login_user(request, form.get_user())
login_user(request, form.get_user(), backend='django.contrib.auth.backends.ModelBackend')
logging.user(request, "~FG~BB~SKAPI Login~SN~FW: %s / %s" % (user_agent, ip))
code = 1
else:
@ -58,7 +58,7 @@ def signup(request):
if form.is_valid():
try:
new_user = form.save()
login_user(request, new_user)
login_user(request, new_user, backend='django.contrib.auth.backends.ModelBackend')
logging.user(request, "~FG~SB~BBAPI NEW SIGNUP: ~FW%s / %s" % (new_user.email, ip))
code = 1
except forms.ValidationError as e:

4
apps/profile/views.py
View file

@ -92,7 +92,7 @@ def login(request):
if request.method == "POST":
form = LoginForm(data=request.POST)
if form.is_valid():
login_user(request, form.get_user())
login_user(request, form.get_user(), backend='django.contrib.auth.backends.ModelBackend')
logging.user(form.get_user(), "~FG~BBOAuth Login~FW")
return HttpResponseRedirect(request.POST['next'] or reverse('index'))
@ -121,7 +121,7 @@ def signup(request):
form = SignupForm(data=request.POST, prefix="signup")
if form.is_valid() and not recaptcha_error:
new_user = form.save()
login_user(request, new_user)
login_user(request, new_user, backend='django.contrib.auth.backends.ModelBackend')
logging.user(new_user, "~FG~SB~BBNEW SIGNUP: ~FW%s" % new_user.email)
new_user.profile.activate_free()
return HttpResponseRedirect(request.POST['next'] or reverse('index'))

6
apps/reader/views.py
View file

@ -170,7 +170,7 @@ def login(request):
if request.method == "POST":
form = LoginForm(request.POST, prefix='login')
if form.is_valid():
login_user(request, form.get_user())
login_user(request, form.get_user(), backend='django.contrib.auth.backends.ModelBackend')
if request.POST.get('api'):
logging.user(form.get_user(), "~FG~BB~SKiPhone Login~FW")
code = 1
@ -232,7 +232,7 @@ def autologin(request, username, secret):
user = profile[0].user
user.backend = settings.AUTHENTICATION_BACKENDS[0]
login_user(request, user)
login_user(request, user, backend='django.contrib.auth.backends.ModelBackend')
logging.user(user, "~FG~BB~SKAuto-Login. Next stop: %s~FW" % (next if next else 'Homepage',))
if next and not next.startswith('/'):
@ -2376,7 +2376,7 @@ def login_as(request):
username = request.GET['user']
user = get_object_or_404(User, username__iexact=username)
user.backend = settings.AUTHENTICATION_BACKENDS[0]
login_user(request, user)
login_user(request, user, backend='django.contrib.auth.backends.ModelBackend')
return HttpResponseRedirect(reverse('index'))
def iframe_buster(request):