Draft: 346: account management

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .mypy_cache/
 /.env
-.vscode
+.vscode
+.idea

api/requirements/dev.txt

@@ -13,25 +13,33 @@ boto==2.49.0              # via django-boto
 certifi==2019.9.11        # via requests
 cffi==1.12.3              # via argon2-cffi
 chardet==3.0.4            # via requests
+charset-normalizer==2.0.4
 coreapi==2.3.3            # via drf-yasg
 coreschema==0.0.4         # via coreapi, drf-yasg
 coverage==4.5.3
+cryptography==3.4.8
+defusedxml==0.7.1
 django-boto==0.3.12
+django-cors-headers==3.8.0
 django-debug-toolbar==2.2.1
 django-environ==0.4.5
 django-extensions==2.1.9
 django-model-utils==3.2.0
+django-rest-auth==0.9.5
 django-storages==1.7.1
+django-templated-mail==1.1.1
 django==3.1.12
 djangorestframework==3.11.2
+djangorestframework-simplejwt==4.4.0
+djoser==2.1.0
 drf-yasg==1.17.0
 factory-boy==2.12.0
 faker==2.0.0              # via factory-boy
 gevent==1.4.0
 greenlet==0.4.15          # via gevent
 gunicorn==19.9.0
 idna==2.8                 # via requests
-importlib-metadata==0.18  # via pluggy, pytest
+importlib-metadata==1.3.0  # via pluggy, pytest
 inflection==0.3.1         # via drf-yasg
 itypes==1.1.0             # via coreapi
 jinja2==2.11.3            # via coreschema
@@ -41,22 +49,27 @@ more-itertools==7.1.0     # via pytest
 mypy-extensions==0.4.1    # via mypy
 mypy==0.720
 numpy==1.16.4
+oauthlib==3.1.1
 packaging==19.0           # via drf-yasg, pytest
 pandas==0.24.2
 pluggy==0.12.0            # via pytest
 psycopg2-binary==2.8.3
 py==1.10.0                 # via pytest
 pycparser==2.19           # via cffi
+pyjwt==1.7.1
 pynmea2==1.15.0
 pyparsing==2.4.0          # via packaging
 pytest-django==3.5.1
 pytest==5.0.1             # via pytest-django
 python-dateutil==2.8.0    # via django-boto, faker, pandas
 pytz==2019.1              # via django, pandas
 requests==2.22.0          # via coreapi
+requests-oauthlib==1.3.0
 ruamel.yaml.clib==0.2.0   # via ruamel.yaml
 ruamel.yaml==0.16.5       # via drf-yasg
 six==1.12.0               # via argon2-cffi, astroid, django-extensions, drf-yasg, faker, packaging, python-dateutil
+social-auth-app-django==4.0.0
+social-auth-core==4.0.2
 sqlparse==0.3.0           # via django, django-debug-toolbar
 text-unidecode==1.2       # via faker
 typed-ast==1.4.0          # via astroid, mypy

api/requirements/prod.txt

@@ -10,15 +10,21 @@ boto==2.49.0              # via django-boto
 certifi==2019.9.11        # via requests
 cffi==1.12.3              # via argon2-cffi
 chardet==3.0.4            # via requests
+charset-normalizer==2.0.4
 coreapi==2.3.3            # via drf-yasg
 coreschema==0.0.4         # via coreapi, drf-yasg
 django-boto==0.3.12
+django-cors-headers==3.8.0
 django-environ==0.4.5
 django-extensions==2.2.6
 django-model-utils==3.2.0
+django-rest-auth==0.9.5
 django-storages==1.8
+django-templated-mail==1.1.1
 django==3.1.12
 djangorestframework==3.11.2
+djangorestframework-simplejwt==4.4.0
+djoser==2.1.0
 drf-yasg==1.17.0
 gevent==1.4.0
 greenlet==0.4.15          # via gevent
@@ -29,18 +35,23 @@ itypes==1.1.0             # via coreapi
 jinja2==2.11.3            # via coreschema
 markupsafe==1.1.1         # via jinja2
 numpy==1.16.4
+oauthlib==3.1.1
 packaging==19.2           # via drf-yasg
 pandas==0.24.2
 psycopg2-binary==2.8.3
 pycparser==2.19           # via cffi
+pyjwt==1.7.1
 pynmea2==1.15.0
 pyparsing==2.4.5          # via packaging
 python-dateutil==2.8.0    # via django-boto, pandas
 pytz==2019.1              # via django, pandas
 requests==2.22.0          # via coreapi
+requests-oauthlib==1.3.0
 ruamel.yaml.clib==0.2.0   # via ruamel.yaml
 ruamel.yaml==0.16.5       # via drf-yasg
 six==1.12.0               # via argon2-cffi, django-extensions, drf-yasg, packaging, python-dateutil
+social-auth-app-django==4.0.0
+social-auth-core==4.0.2
 sqlparse==0.3.0           # via django
 uritemplate==3.0.0        # via coreapi, drf-yasg
 urllib3==1.25.8           # via requests

api/woeip/apps/core/admin.py

@@ -1,5 +1,24 @@
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from woeip.apps.core.models import User
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+
+class UserAdmin(BaseUserAdmin):
+    # add_form =  UserCreationForm
+    model = User
+
+    list_display = ('first_name', 'last_name', 'email', 'is_staff')
+    list_filter = ('is_staff',)
+
+    fieldsets = (
+        (None, {'fields': ('first_name','last_name','email','password')}),
+
+        ('Permissions', {'fields': ('is_staff',)}),
+    )
+
+    search_fields =  ('first_name', 'last_name', 'email')
+    ordering = ('last_name','email')
+
+    filter_horizontal = ()
 
 admin.site.register(User, UserAdmin)

api/woeip/apps/core/forms.py

@@ -0,0 +1,2 @@
+from django.contrib.auth.forms import UserCreationForm
+

api/woeip/apps/core/migrations/0003_auto_20210908_0407.py

@@ -0,0 +1,55 @@
+# Generated by Django 3.1.12 on 2021-09-08 04:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_auto_20210328_1247'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='user',
+            options={},
+        ),
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='date_joined',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='username',
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_active',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(max_length=255),
+        ),
+    ]

api/woeip/apps/core/models.py

@@ -1,6 +1,35 @@
-from django.contrib.auth.models import AbstractUser
+from django.db import models
+from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, BaseUserManager
 
+class UserAccountManager(BaseUserManager):
+    def create_user(self, email, first_name, last_name, password=None):
+        if not email:
+            raise ValueError('Users must have an email address')
 
-class User(AbstractUser):
-    class Meta:
-        get_latest_by = "date_joined"
+        email = self.normalize_email(email)
+        user = self.model(email=email, first_name=first_name, last_name=last_name)
+
+        user.set_password(password)
+        user.save()
+
+        return user
+
+class User(AbstractBaseUser, PermissionsMixin):
+    email = models.EmailField(max_length=255, unique=True)
+    first_name = models.CharField(max_length=255)
+    last_name = models.CharField(max_length=255)
+    is_active = models.BooleanField(default=True)
+    is_staff = models.BooleanField(default=False)
+
+    USERNAME_FIELD = 'email'
+    REQUIRED_FIELDS = ['first_name', 'last_name']
+    objects = UserAccountManager()
+
+    def get_full_name(self): 
+        return self.first_name + self.last_name
+
+    def get_short_name(self):
+        return self.first_name
+
+    def __str__(self):
+        return self.email

api/woeip/apps/core/serializers.py

@@ -1,8 +1,9 @@
-from rest_framework import serializers
-from woeip.apps.core.models import User
+from djoser.serializers import UserCreateSerializer
+from django.contrib.auth import get_user_model
 
+User = get_user_model()
 
-class UserSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
+class UserCreateSerializer(UserCreateSerializer):
+    class Meta(UserCreateSerializer.Meta):
         model = User
-        fields = ["username", "first_name", "last_name", "email"]
+        fields = ('id', 'email', 'first_name', 'last_name', 'password')

api/woeip/apps/core/views.py

@@ -2,11 +2,12 @@
 from rest_framework import viewsets
 from woeip.apps.core import models
 from woeip.apps.core import serializers
+from django.shortcuts import redirect, render
 
 
 class UserViewSet(viewsets.ModelViewSet):
     queryset = models.User.objects.all()
-    serializer_class = serializers.UserSerializer
+    serializer_class = serializers.UserCreateSerializer
 
     def get_queryset(self):
         queryset = models.User.objects.all()

api/woeip/settings.py

@@ -1,9 +1,11 @@
 import environ
+import datetime
 from django.core.exceptions import ImproperlyConfigured
 
 repo_root = environ.Path(__file__) - 2
 project_root = environ.Path(__file__) - 1
 env = environ.Env(DEBUG=(bool, False))
+env.read_env() #needed to read .env file. TODO: store DJOSER password with other passwords.
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = env("SECRET_KEY")
@@ -14,7 +16,7 @@
 # NOTE: This setting assumes all requests are proxied through a web server (e.g. nginx). If that is not the case,
 # ensure this is set to a more restrictive value. See https://docs.djangoproject.com/en/2.1/ref/settings/#allowed-hosts
 # for more information.
-ALLOWED_HOSTS = ["*"]
+# ALLOWED_HOSTS = ["*"]
 
 # Application definition
 
@@ -30,7 +32,14 @@
     "django.contrib.gis",
 ]
 
-THIRD_PARTY_APPS = ["django_extensions", "rest_framework", "storages", "drf_yasg"]
+THIRD_PARTY_APPS = [
+    "django_extensions",
+    "rest_framework",
+    "storages",
+    "drf_yasg",
+    "djoser",
+    "corsheaders"
+]
 
 LOCAL_APPS = ["woeip.apps.core", "woeip.apps.air_quality"]
 
@@ -55,22 +64,38 @@
 
 
 MIDDLEWARE = [
+    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
+    "corsheaders.middleware.CorsPostCsrfMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
 ]
 
+# Origin host/header names that are authorized to send cross-site HTTP requests.
+CORS_ALLOWED_ORIGINS = [
+    "http://api.lvh.me",
+    "http://lvh.me",
+]
+
+# Host/domain names that can recieve requests from this Django site.
+ALLOWED_HOSTS = [
+    "api.lvh.me",
+]
+
+CORS_ALLOW_CREDENTIALS = True
+
 ROOT_URLCONF = "woeip.urls"
 
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [str(project_root.path("templates"))],
+        # "DIRS": [os.path.join(BASE_DIR, 'build')]
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
@@ -193,5 +218,50 @@ def generate_file_handler(filename):
 LOGIN_REDIRECT_URL = "upload"
 LOGOUT_REDIRECT_URL = "login"
 
-EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
-EMAIL_FILE_PATH = str(project_root.path("sent_emails"))
+# EMAIL
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = '[email protected]'
+EMAIL_HOST_PASSWORD = env("DJOSER_ACCESS_KEY")
+EMAIL_USE_TLS = True
+
+SITE_NAME = ('WOAQ')
+DOMAIN = ('lvh.me') 
+#DJOSER
+DJOSER = {
+    'LOGIN_FIELD': 'email',
+    'USER_CREATE_PASSWORD_RETYPE': True,
+    'USERNAME_CHANGED_EMAIL_CONFIRMATION': True,
+    'PASSWORD_CHANGED_EMAIL_CONFIRMATION': True,
+    'SEND_ACTIVATION_EMAIL': True,
+    'SEND_CONFIRMATION_EMAIL': True,
+    'SET_USERNAME_RETYPE': True,
+    'SET_PASSWORD_RETYPE': True,
+    'PASSWORD_RESET_CONFIRM_URL': 'password/reset/confirm/{uid}/{token}',
+    'USERNAME_RESET_CONFIRM_URL': 'email/reset/confirm/{uid}/{token}',
+    'ACTIVATION_URL': 'activate/{uid}/{token}',
+    'END_ACTIVATION_EMAIL': True,
+    'SERIALIZERS': {
+        'user_create': 'woeip.apps.core.serializers.UserCreateSerializer',
+        'user': 'woeip.apps.core.serializers.UserCreateSerializer',
+        'user_delete': 'djoser.serializers.UserDeleteSerializer',
+    }
+}
+
+REST_FRAMEWORK = {
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+        'rest_framework.authentication.TokenAuthentication',
+    ),
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework_simplejwt.authentication.JWTAuthentication',
+    ),
+}
+
+SIMPLE_JWT = {
+   'AUTH_HEADER_TYPES': ('JWT',),
+   'JWT_ALLOW_REFRESH': True,
+   'JWT_EXPIRATION_DELTA': datetime.timedelta(minutes=60),
+   'JWT_REFRESH_EXPIRATION_DELTA': datetime.timedelta(days=1),
+}