diff --git a/stude/accounts/admin.py b/stude/accounts/admin.py index 8c38f3f..5ef0f20 100644 --- a/stude/accounts/admin.py +++ b/stude/accounts/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from .models import CustomUser -# Register your models here. +admin.site.register(CustomUser, UserAdmin) diff --git a/stude/accounts/migrations/0001_initial.py b/stude/accounts/migrations/0001_initial.py new file mode 100644 index 0000000..7d6b2c1 --- /dev/null +++ b/stude/accounts/migrations/0001_initial.py @@ -0,0 +1,48 @@ +# Generated by Django 4.2.2 on 2023-06-26 11:43 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='CustomUser', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('is_student', models.BooleanField(default=True)), + ('is_banned', models.BooleanField(default=False)), + ('year_level', models.CharField(blank=True, max_length=50, null=True)), + ('semester', models.CharField(blank=True, max_length=50, null=True)), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/stude/accounts/models.py b/stude/accounts/models.py index cb03308..6dc3a0d 100644 --- a/stude/accounts/models.py +++ b/stude/accounts/models.py @@ -4,7 +4,7 @@ from django.db import models class CustomUser(AbstractUser): is_student = models.BooleanField(default=True) - is_admin = models.BooleanField(default=False) is_banned = models.BooleanField(default=False) year_level = models.CharField(max_length=50, null=True, blank=True) semester = models.CharField(max_length=50, null=True, blank=True) + pass diff --git a/stude/accounts/serializers.py b/stude/accounts/serializers.py new file mode 100644 index 0000000..cbcdb0f --- /dev/null +++ b/stude/accounts/serializers.py @@ -0,0 +1,15 @@ +from djoser.serializers import UserCreateSerializer as BaseUserRegistrationSerializer +from djoser.serializers import UserSerializer as BaseUserSerializer +from accounts.models import CustomUser + + +class CustomUserSerializer(BaseUserSerializer): + class Meta(BaseUserSerializer.Meta): + model = CustomUser + fields = '__all__' + + +class UserRegistrationSerializer(BaseUserRegistrationSerializer): + class Meta(BaseUserRegistrationSerializer.Meta): + fields = ('is_student', + 'is_banned', 'year_level', 'semester') diff --git a/stude/config/settings.py b/stude/config/settings.py index 70aae0a..1e7f837 100644 --- a/stude/config/settings.py +++ b/stude/config/settings.py @@ -35,6 +35,7 @@ ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] # Application definition INSTALLED_APPS = [ + 'accounts', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -44,7 +45,7 @@ INSTALLED_APPS = [ 'rest_framework', 'djoser', 'rest_framework.authtoken', - 'accounts', + ] MIDDLEWARE = [ @@ -81,12 +82,6 @@ REST_FRAMEWORK = { ) } -DJOSER = { - 'SEND_ACTIVATION_EMAIL': True, - 'SEND_CONFIRMATION_EMAIL': True, - 'ACTIVATION_URL': 'activation/{uid}/{token}', -} - WSGI_APPLICATION = 'config.wsgi.application' @@ -100,6 +95,20 @@ DATABASES = { } } +AUTH_USER_MODEL = 'accounts.CustomUser' + +DJOSER = { + 'SEND_ACTIVATION_EMAIL': True, + 'SEND_CONFIRMATION_EMAIL': True, + 'ACTIVATION_URL': 'activation/{uid}/{token}', + 'USER_AUTHENTICATION_RULES': ['djoser.authentication.TokenAuthenticationRule'], + 'SERIALIZERS': { + 'user': 'accounts.serializers.CustomUserSerializer', + 'user_create': 'accounts.serializers.UserRegistrationSerializer', + }, +} + + # Email credentials if (DEBUG == True): EMAIL_HOST = str(os.getenv('DEV_EMAIL_HOST'))