+# -*- coding: utf-8 -*-
+
+import datetime
+import logging
+
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.core.urlresolvers import reverse
-from forum.models import User
from django.http import HttpResponseRedirect, Http404
-from forum.http_responses import HttpResponseUnauthorized
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext as _
-from django.utils.http import urlquote_plus
-from django.contrib.auth.decorators import login_required
+from django.utils.encoding import smart_unicode
from django.contrib.auth import login, logout
-from django.http import get_host
-from forum.actions import SuspendAction
-from forum.utils import html
-from forum import settings
+
from writers import manage_pending_data
-import types
-import datetime
-import logging
-from forum.forms import SimpleRegistrationForm, SimpleEmailSubscribeForm, \
- TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
+from forum.utils import html
+from forum.views.decorators import login_required
+from forum.modules import decorate
+from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
+from forum.http_responses import HttpResponseUnauthorized
from forum.utils.mail import send_template_email
-
from forum.authentication.base import InvalidAuthentication
from forum.authentication import AUTH_PROVIDERS
-
-from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer
+from forum.models import User, AuthKeyUserAssociation, ValidationHash
from forum.actions import UserJoinsAction
+from forum import settings
+
+from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR
def signin_page(request):
- request.session['on_signin_url'] = request.META.get('HTTP_REFERER', '/')
+ referer = request.META.get('HTTP_REFERER', '/')
+
+ # If the referer is equal to the sign up page, e. g. if the previous login attempt was not successful we do not
+ # change the sign in URL. The user should go to the same page.
+ if not referer.replace(settings.APP_URL, '') == reverse('auth_signin'):
+ request.session[ON_SIGNIN_SESSION_ATTR] = referer
- all_providers = [provider.context for provider in AUTH_PROVIDERS.values()]
+ all_providers = [provider.context for provider in AUTH_PROVIDERS.values() if provider.context]
sort = lambda c1, c2: c1.weight - c2.weight
can_show = lambda c: not request.user.is_authenticated() or c.show_to_logged_in_user
assoc = AuthKeyUserAssociation.objects.get(key=assoc_key)
user_ = assoc.user
return login_and_forward(request, user_)
- except:
+ except AuthKeyUserAssociation.DoesNotExist:
request.session['assoc_key'] = assoc_key
request.session['auth_provider'] = provider
return HttpResponseRedirect(reverse('auth_external_register'))
def external_register(request):
if request.method == 'POST' and 'bnewaccount' in request.POST:
form1 = SimpleRegistrationForm(request.POST)
- email_feeds_form = SimpleEmailSubscribeForm(request.POST)
- if (form1.is_valid() and email_feeds_form.is_valid()):
+ if form1.is_valid():
user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'])
user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
user_.set_unusable_password()
uassoc = AuthKeyUserAssociation(user=user_, key=assoc_key, provider=auth_provider)
uassoc.save()
- if email_feeds_form.cleaned_data['subscribe'] == 'n':
- user_.subscription_settings.enable_notifications = False
- user_.subscription_settings.save()
-
del request.session['assoc_key']
del request.session['auth_provider']
return HttpResponseRedirect(reverse('auth_signin'))
provider_class = AUTH_PROVIDERS[auth_provider].consumer
- user_data = provider_class.get_user_data(request.session['assoc_key'])
+
+ # Pass the cookies to the Facebook authentication class get_user_data method. We need them to take the access token.
+ if provider_class.__class__.__name__ == 'FacebookAuthConsumer':
+ user_data = provider_class.get_user_data(request.COOKIES)
+ else:
+ user_data = provider_class.get_user_data(request.session['assoc_key'])
if not user_data:
user_data = request.session.get('auth_consumer_data', {})
'username': username,
'email': email,
})
- email_feeds_form = SimpleEmailSubscribeForm()
provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
return render_to_response('auth/complete.html', {
'form1': form1,
- 'email_feeds_form': email_feeds_form,
- 'provider':mark_safe(provider_context.human_name),
+ 'provider':provider_context and mark_safe(provider_context.human_name) or _('unknown'),
'login_type':provider_context.id,
'gravatar_faq_url':reverse('faq') + '#gravatar',
}, context_instance=RequestContext(request))
user = get_object_or_404(User, id=user)
if (ValidationHash.objects.validate(code, user, 'templogin', [user.id])):
+
+ # If the user requests temp_signin he must have forgotten his password. So we mark it as unusable.
+ user.set_unusable_password()
+ user.save()
+
return login_and_forward(request, user, reverse('user_authsettings', kwargs={'id': user.id}),
_(
"You are logged in with a temporary access key, please take the time to fix your issue with authentication."
if not request.user.is_authenticated():
return HttpResponseUnauthorized(request)
else:
+ # We check if there are some old validation hashes. If there are -- we delete them.
try:
hash = ValidationHash.objects.get(user=request.user, type='email')
- if hash.expiration < datetime.datetime.now():
- hash.delete()
- return send_validation_email(request)
+ hash.delete()
except:
- hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
+ pass
+
+ # We don't care if there are previous cashes in the database... In every case we have to create a new one
+ hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
send_template_email([request.user], "auth/mail_validation.html", {'validation_code': hash})
request.user.message_set.create(message=_("A message with an email validation link was just sent to your address."))
if (ValidationHash.objects.validate(code, user, 'email', [user.email])):
user.email_isvalid = True
user.save()
- return login_and_forward(request, user, None, _("Thank you, your email is now validated."))
+ return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated."))
else:
- raise Http404()
+ return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request))
-@login_required
def auth_settings(request, id):
user_ = get_object_or_404(User, id=id)
'form': form,
'has_password': user_.has_usable_password(),
'auth_keys': auth_keys_list,
+ 'allow_local_auth': AUTH_PROVIDERS.get('local', None),
}, context_instance=RequestContext(request))
def remove_external_provider(request, id):
login(request, user)
if message is None:
- message = _("Welcome back %s, you are now logged in") % user.username
+ message = _("Welcome back %s, you are now logged in") % smart_unicode(user.username)
request.user.message_set.create(message=message)
if not forward:
- forward = request.session.get('on_signin_url', reverse('index'))
-
- pending_data = request.session.get('pending_submission_data', None)
+ forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index'))
+
+ pending_data = request.session.get(PENDING_SUBMISSION_SESSION_ATTR, None)
if pending_data and (user.email_isvalid or pending_data['type'] not in settings.REQUIRE_EMAIL_VALIDATION_TO):
submission_time = pending_data['time']
if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)):
- del request.session['pending_submission_data']
+ del request.session[PENDING_SUBMISSION_SESSION_ATTR]
elif submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.WARN_PENDING_POSTS_MINUTES)):
user.message_set.create(message=(_("You have a %s pending submission.") % pending_data['data_name']) + " %s, %s, %s" % (
html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('save')}), _("save it")),
request.user.message_set.create(message)
return HttpResponseRedirect(reverse('index'))
-@login_required
+@decorate.withfn(login_required)
def signout(request):
logout(request)
- return HttpResponseRedirect(reverse('index'))
\ No newline at end of file
+ return HttpResponseRedirect(reverse('index'))
projects / osqa.git / blobdiff