Merge pull request #21 from caravancoop/release/v0.7

Release v0.7

Author: merwok

.gitignore

@@ -1,12 +1,13 @@
 *.pyc
 __pycache__
-db.sqlite3
+/demo/db.sqlite3
+/demo/.env
 
 # Test artifacts
-.cache/
-.tox/
+/.cache/
+/.tox/
 
 # Packaging litter
-*.egg-info
-build/
-dist/
+/*.egg-info
+/build/
+/dist/

demo/demo/accounts/admin.py

@@ -1,20 +1,14 @@
 from django.contrib import admin
-from django.contrib.auth.admin import GroupAdmin, UserAdmin as BaseUserAdmin
+from django.contrib.auth.admin import GroupAdmin
+
+from rest_auth_toolkit.admin import BaseEmailUserAdmin
 
 from .models import APIToken, BaseGroup, Group, User, EmailConfirmation
 
 
-class UserAdmin(BaseUserAdmin):
-    list_display = ('email', 'first_name', 'last_name', 'is_active', 'is_staff')
-    add_form_template = None
-    add_fieldsets = (
-        (None, {
-            'classes': ('wide',),
-            'fields': ('email', 'password1', 'password2'),
-        }),
-    )
+class UserAdmin(BaseEmailUserAdmin):
     date_hierarchy = 'date_joined'
-    readonly_fields = ('username', 'date_joined', 'last_login')
+    readonly_fields = ('date_joined', 'last_login')
 
 
 class EmailConfirmationAdmin(admin.ModelAdmin):

demo/demo/accounts/authentication.py

@@ -4,4 +4,5 @@
 
 
 class APITokenAuthentication(TokenAuthentication):
+    keyword = 'Bearer'
     model = APIToken

demo/demo/accounts/migrations/0002_auto_20180222_0012.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-02-22 00:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='username',
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=255, unique=True, verbose_name='email address'),
+        ),
+    ]

demo/demo/accounts/models.py

@@ -1,48 +1,16 @@
-from django.contrib.auth.models import AbstractUser, BaseUserManager, Group as BaseGroup
+from django.contrib.auth.models import Group as BaseGroup
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-import shortuuid
 from model_utils.fields import AutoCreatedField
 from model_utils.models import TimeStampedModel
 from shortuuidfield import ShortUUIDField
 
-from rest_auth_toolkit.models import BaseAPIToken, BaseEmailConfirmation
+from rest_auth_toolkit.managers import BaseEmailUserManager
+from rest_auth_toolkit.models import BaseEmailUser, BaseAPIToken, BaseEmailConfirmation
 
 
-class UserManager(BaseUserManager):
-    use_in_migrations = True
-
-    def get_by_natural_key(self, email):
-        return self.get(email=email)
-
-    def _create_user(self, email, password, **extra_fields):
-        email = self.normalize_email(email)
-        user = self.model(email=email, **extra_fields)
-        # XXX username is not automatically generated, don't understand why
-        # (same model in another project works well!)
-        if not user.username:
-            user.username = str(shortuuid.uuid())
-        user.set_password(password)
-        user.save(using=self._db)
-        return user
-
-    def create_user(self, email, password=None, **extra_fields):
-        extra_fields.setdefault('is_staff', False)
-        extra_fields.setdefault('is_superuser', False)
-        return self._create_user(email, password, **extra_fields)
-
-    def create_superuser(self, email, password, **extra_fields):
-        extra_fields.setdefault('is_staff', True)
-        extra_fields.setdefault('is_superuser', True)
-
-        if not extra_fields['is_staff']:
-            raise ValueError('Superuser must have is_staff=True.')
-        if not extra_fields['is_superuser']:
-            raise ValueError('Superuser must have is_superuser=True.')
-
-        return self._create_user(email, password, **extra_fields)
-
+class UserManager(BaseEmailUserManager):
     def get_or_create_facebook_user(self, facebook_data, facebook_access_token):
         try:
             user = User.objects.get(email=facebook_data['email'])
@@ -62,31 +30,14 @@ def get_or_create_facebook_user(self, facebook_data, facebook_access_token):
             return user, False
 
 
-class User(AbstractUser):
-    """Custom user with email as login field."""
-    USERNAME_FIELD = 'email'
-    REQUIRED_FIELDS = []
-
-    # Admin doesn't work well without username field; shortuuid provides
-    # a simple way to get unique string values at creation time.
-    username = ShortUUIDField()
-    email = models.EmailField(max_length=255, unique=True)
+class User(BaseEmailUser):
     facebook_id = models.CharField(
         max_length=255, null=True, blank=True, help_text=_('FB third-party ID'))
     facebook_access_token = models.CharField(
         max_length=255, null=True, blank=True, help_text=_('FB access token'))
 
     objects = UserManager()
 
-    def __str__(self):
-        return self.email
-
-    def get_short_name(self):
-        return self.email
-
-    def natural_key(self):
-        return self.email
-
 
 class Group(BaseGroup):
     """Proxy model to have users and groups together in admin."""

demo/requirements.in

@@ -1,6 +1,6 @@
 pip-tools
 
-django
+django ~= 1.11
 djangorestframework
 django-debug-toolbar
 
@@ -9,3 +9,7 @@ django-debug-toolbar
 
 django-model-utils
 django-shortuuidfield
+
+# for the browsable API
+markdown
+pygments

demo/requirements.txt

@@ -5,14 +5,16 @@
 #    pip-compile --output-file requirements.txt requirements.in
 #
 click==6.7                # via pip-tools
-django-debug-toolbar==1.8
-django-model-utils==3.0.0
+django-debug-toolbar==1.9.1
+django-model-utils==3.1.1
 django-shortuuidfield==0.1.3
-django==1.11.6
-djangorestframework==3.7.1
+django==1.11.10
+djangorestframework==3.7.7
 first==2.0.1              # via pip-tools
-pip-tools==1.10.1
-pytz==2017.2              # via django
+markdown==2.6.11
+pip-tools==1.11.0
+pygments==2.2.0
+pytz==2018.3              # via django
 shortuuid==0.5.0          # via django-shortuuidfield
 six==1.11.0               # via django-shortuuidfield, pip-tools
 sqlparse==0.2.4           # via django-debug-toolbar

requirements.txt

@@ -4,13 +4,13 @@
 #
 #    pip-compile --output-file requirements.txt setup.py
 #
-certifi==2017.7.27.1      # via requests
+certifi==2018.1.18        # via requests
 chardet==3.0.4            # via requests
-django==1.11.6
-djangorestframework==3.7.1
+django==1.11.10
+djangorestframework==3.7.7
 facepy==1.0.9
 idna==2.6                 # via requests
-pytz==2017.2              # via django
+pytz==2018.3              # via django
 requests==2.18.4          # via facepy
 six==1.11.0               # via facepy
 urllib3==1.22             # via requests

rest_auth_toolkit/admin.py

@@ -0,0 +1,22 @@
+from django.contrib.auth.admin import UserAdmin
+from django.utils.translation import gettext_lazy as _
+
+
+class BaseEmailUserAdmin(UserAdmin):
+    list_display = ('email', 'first_name', 'last_name', 'is_active', 'is_staff')
+    fieldsets = (
+        (None, {'fields': ('email', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name')}),
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+                                       'groups', 'user_permissions')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+    )
+    # add_form_template = None
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('email', 'password1', 'password2'),
+        }),
+    )
+    search_fields = ('first_name', 'last_name', 'email')
+    ordering = ('email',)

rest_auth_toolkit/managers.py

@@ -1,6 +1,37 @@
+from django.contrib.auth.models import BaseUserManager
 from django.db import models
 
 
+class BaseEmailUserManager(BaseUserManager):
+    use_in_migrations = True
+
+    def get_by_natural_key(self, email):
+        return self.get(email=email)
+
+    def _create_user(self, email, password, **extra_fields):
+        email = self.normalize_email(email)
+        user = self.model(email=email, **extra_fields)
+        user.set_password(password)
+        user.save(using=self._db)
+        return user
+
+    def create_user(self, email, password=None, **extra_fields):
+        extra_fields.setdefault('is_staff', False)
+        extra_fields.setdefault('is_superuser', False)
+        return self._create_user(email, password, **extra_fields)
+
+    def create_superuser(self, email, password, **extra_fields):
+        extra_fields.setdefault('is_staff', True)
+        extra_fields.setdefault('is_superuser', True)
+
+        if not extra_fields['is_staff']:
+            raise ValueError('Superuser must have is_staff=True.')
+        if not extra_fields['is_superuser']:
+            raise ValueError('Superuser must have is_superuser=True.')
+
+        return self._create_user(email, password, **extra_fields)
+
+
 class BaseAPITokenManager(models.Manager):
     def create_token(self, user):
         return self.create(user=user)