Merge branch 'incomplete_register_redirect' into 'master'

Incomplete register redirect Let browserid handle the new users registration.

Merge branch 'incomplete_register_redirect' into 'master'
Incomplete register redirect Let browserid handle the new users registration.
Sergio Oliveira
2 parents 44419239 8fb93ee6
Showing 12 changed files with 96 additions and 56 deletions Show diff stats
colab/accounts/auth.py
colab/accounts/forms.py
colab/accounts/management/__init__.py
colab/accounts/management/commands/__init__.py
colab/accounts/management/commands/delete_invalid.py
colab/accounts/middleware.py
colab/accounts/migrations/0002_user_needs_update.py
colab/accounts/migrations/0003_auto_20141218_1755.py
colab/accounts/models.py
colab/accounts/views.py
colab/settings.py
colab/templates/base.html
 from django_browserid.auth import BrowserIDBackend
+
 class ColabBrowserIDBackend(BrowserIDBackend):
     def filter_users_by_email(self, email):
         return self.User.objects.filter(emails__address=email)
@@ -32,7 +32,7 @@ class UserForm(forms.ModelForm):
         # Forces username to be lowercase always
         widget=forms.TextInput(attrs={'style' : 'text-transform: lowercase;'}),
     )
-    required = ('first_name', 'last_name', 'email', 'username')
+    required = ('first_name', 'last_name', 'username')
     class Meta:
         model = User
@@ -49,9 +49,17 @@ class UserForm(forms.ModelForm):
 class UserCreationForm(UserForm):
+
+    def clean_username(self):
+        username = self.cleaned_data['username']
+        username = username.strip()
+        if not username:
+            raise forms.ValidationError(_('This field cannot be blank.'))
+        return username
+
     class Meta:
         model = User
-        fields = ('first_name', 'last_name', 'email', 'username')
+        fields = ('first_name', 'last_name', 'username')
 class UserUpdateForm(UserForm):
@@ -1,42 +0,0 @@
-
-
-from django.db.models import F
-from django.utils import timezone
-from django.utils.translation import ugettext as _
-from django.core.management.base import BaseCommand, CommandError
-
-
-from ...models import User
-
-
-class Command(BaseCommand):
-    """Delete user accounts that have never logged in.
-
-    Delete from database user accounts that have never logged in
-    and are at least 24h older.
-
-    """
-
-    help = __doc__
-
-    def handle(self, *args, **kwargs):
-        seconds = timezone.timedelta(seconds=1)
-        now = timezone.now()
-        one_day_ago = timezone.timedelta(days=1)
-
-        # Query for users that have NEVER logged in
-        #
-        # By default django sets the last_login as auto_now and then
-        #   last_login is pretty much the same than date_joined
-        #   (instead of null as I expected). Because of that we query
-        #   for users which last_login is between date_joined - N and
-        #   date_joined + N, where N is a small constant in seconds.
-        users = User.objects.filter(last_login__gt=(F('date_joined') - seconds),
-                                    last_login__lt=(F('date_joined') + seconds),
-                                    date_joined__lt=now-one_day_ago)
-        count = 0
-        for user in users:
-            count += 1
-            user.delete()
-
-        print _(u'%(count)s users deleted.') % {'count': count}
@@ -0,0 +1,21 @@
+
+from django.shortcuts import redirect
+
+VIEW_NAMES_ALLOWED = ('signup', 'Logout')
+
+
+class UserRegisterMiddleware(object):
+
+    def process_view(self, request, view_func, view_args, view_kwargs):
+
+        if request.is_ajax():
+            return
+
+        if not request.user.is_authenticated():
+            return
+
+        if not request.user.needs_update:
+            return
+
+        if view_func.__name__ not in VIEW_NAMES_ALLOWED:
+            return redirect('signup')
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='needs_update',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_user_needs_update'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='needs_update',
+            field=models.BooleanField(default=True),
+            preserve_default=True,
+        ),
+    ]
@@ -26,6 +26,7 @@ class User(AbstractUser):
     verification_hash = models.CharField(max_length=32, null=True, blank=True)
     modified = models.DateTimeField(auto_now=True)
     bio = models.CharField(max_length=200, null=True, blank=True)
+    needs_update = models.BooleanField(default=True)
     def check_password(self, raw_password):
@@ -123,21 +123,34 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
 def signup(request):
+    user = request.user
+
+    # If the user is not authenticated, redirect to login
+    if not user.is_authenticated():
+        return redirect('login')
+
+    # If the user doesn't need to update its main data, redirect to its profile
+    if not user.needs_update:
+        return redirect('user_profile', username=user.username)
+
     # If the request method is GET just return the form
     if request.method == 'GET':
         user_form = UserCreationForm()
         lists_form = ListsForm()
+
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
-    user_form = UserCreationForm(request.POST)
+    user_form = UserCreationForm(request.POST, instance=user)
     lists_form = ListsForm(request.POST)
     if not user_form.is_valid() or not lists_form.is_valid():
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
-    user = user_form.save()
+    user = user_form.save(commit=False)
+    user.needs_update = False
+    user.save()
     # Check if the user's email have been used previously
     #   in the mainling lists to link the user to old messages
@@ -152,8 +165,6 @@ def signup(request):
     mailman.update_subscription(user.email, mailing_lists)
     messages.success(request, _('Your profile has been created!'))
-    messages.warning(request, _('You must login to validated your profile. '
-                                'Profiles not validated are deleted in 24h.'))
     return redirect('user_profile', username=user.username)
@@ -214,6 +214,7 @@ MIDDLEWARE_CLASSES = (
     'django_mobile.middleware.MobileDetectionMiddleware',
     'django_mobile.middleware.SetFlavourMiddleware',
     'colab.tz.middleware.TimezoneMiddleware',
+    'colab.accounts.middleware.UserRegisterMiddleware',
 )
 # Add the django_browserid authentication backend.
@@ -272,12 +273,13 @@ LOGIN_URL = &#39;/user/login&#39;
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/?bid_login_failed=true'
 LOGOUT_REDIRECT_URL = '/'
-BROWSERID_CREATE_USER = False
+BROWSERID_CREATE_USER = True
 REVPROXY_ADD_REMOTE_USER = True
 # Converse.js settings
 # This URL must use SSL in order to keep chat sessions secure
+CONVERSEJS_ENABLED = False
 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
 CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
@@ -119,28 +119,28 @@
             {% if proxy.noosfero %}
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                  {% trans "Social" %} <b class="caret"></b> 
+                  {% trans "Social" %} <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu">
                   <li>
                     <a href="/social/search/people">
-                      {% trans "Users" %} 
+                      {% trans "Users" %}
                     </a>
                   </li>
                   <li>
                     <a href="/social/search/communities">
-                      {% trans "Communities" %} 
+                      {% trans "Communities" %}
                     </a>
                   </li>
                   {% if user.is_active %}
                   <li>
                     <a href="/social/profile/{{ user.username }}">
-                      {% trans "Profile" %} 
+                      {% trans "Profile" %}
                     </a>
                   </li>
                   <li>
                     <a href="/social/myprofile/{{ user.username }}">
-                      {% trans "Control panel" %} 
+                      {% trans "Control panel" %}
                     </a>
                   </li>
                 {% endif %}
@@ -180,12 +180,10 @@
               <li class="dropdown hidden-xs hidden-lg">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
                   {% trans 'Login' as login_text %}
                   <li>{% browserid_login text=login_text %}</li>
                 </ul>
               </li>
-              <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
               {% trans 'Login' as login_text %}
               <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
             {% else %}
1		1
2	from django_browserid.auth import BrowserIDBackend	2	from django_browserid.auth import BrowserIDBackend
3		3
		4	+
4	class ColabBrowserIDBackend(BrowserIDBackend):	5	class ColabBrowserIDBackend(BrowserIDBackend):
5	def filter_users_by_email(self, email):	6	def filter_users_by_email(self, email):
6	return self.User.objects.filter(emails__address=email)	7	return self.User.objects.filter(emails__address=email)
	@@ -1,42 +0,0 @@	@@ -1,42 +0,0 @@
1	-
2	-
3	-from django.db.models import F
4	-from django.utils import timezone
5	-from django.utils.translation import ugettext as _
6	-from django.core.management.base import BaseCommand, CommandError
7	-
8	-
9	-from ...models import User
10	-
11	-
12	-class Command(BaseCommand):
13	- """Delete user accounts that have never logged in.
14	-
15	- Delete from database user accounts that have never logged in
16	- and are at least 24h older.
17	-
18	- """
19	-
20	- help = __doc__
21	-
22	- def handle(self, args, *kwargs):
23	- seconds = timezone.timedelta(seconds=1)
24	- now = timezone.now()
25	- one_day_ago = timezone.timedelta(days=1)
26	-
27	- # Query for users that have NEVER logged in
28	- #
29	- # By default django sets the last_login as auto_now and then
30	- # last_login is pretty much the same than date_joined
31	- # (instead of null as I expected). Because of that we query
32	- # for users which last_login is between date_joined - N and
33	- # date_joined + N, where N is a small constant in seconds.
34	- users = User.objects.filter(last_login__gt=(F('date_joined') - seconds),
35	- last_login__lt=(F('date_joined') + seconds),
36	- date_joined__lt=now-one_day_ago)
37	- count = 0
38	- for user in users:
39	- count += 1
40	- user.delete()
41	-
42	- print _(u'%(count)s users deleted.') % {'count': count}
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+
	2	+from django.shortcuts import redirect
	3	+
	4	+VIEW_NAMES_ALLOWED = ('signup', 'Logout')
	5	+
	6	+
	7	+class UserRegisterMiddleware(object):
	8	+
	9	+ def process_view(self, request, view_func, view_args, view_kwargs):
	10	+
	11	+ if request.is_ajax():
	12	+ return
	13	+
	14	+ if not request.user.is_authenticated():
	15	+ return
	16	+
	17	+ if not request.user.needs_update:
	18	+ return
	19	+
	20	+ if view_func.__name__ not in VIEW_NAMES_ALLOWED:
	21	+ return redirect('signup')
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+from __future__ import unicode_literals
	3	+
	4	+from django.db import models, migrations
	5	+
	6	+
	7	+class Migration(migrations.Migration):
	8	+
	9	+ dependencies = [
	10	+ ('accounts', '0001_initial'),
	11	+ ]
	12	+
	13	+ operations = [
	14	+ migrations.AddField(
	15	+ model_name='user',
	16	+ name='needs_update',
	17	+ field=models.BooleanField(default=False),
	18	+ preserve_default=True,
	19	+ ),
	20	+ ]
	@@ -26,6 +26,7 @@ class User(AbstractUser):		@@ -26,6 +26,7 @@ class User(AbstractUser):
26	verification_hash = models.CharField(max_length=32, null=True, blank=True)	26	verification_hash = models.CharField(max_length=32, null=True, blank=True)
27	modified = models.DateTimeField(auto_now=True)	27	modified = models.DateTimeField(auto_now=True)
28	bio = models.CharField(max_length=200, null=True, blank=True)	28	bio = models.CharField(max_length=200, null=True, blank=True)
		29	+ needs_update = models.BooleanField(default=True)
29		30
30	def check_password(self, raw_password):	31	def check_password(self, raw_password):
31		32