From 23a4a491b9104fa1984c025bc8556c74352721b1 Mon Sep 17 00:00:00 2001 From: Kumi Date: Mon, 8 Aug 2022 15:17:48 +0000 Subject: [PATCH] User model --- datastore/managers.py | 21 +++++++++++++++++ datastore/migrations/0001_initial.py | 34 ++++++++++++++++++++++++++++ datastore/models.py | 3 --- datastore/models/__init__.py | 1 + datastore/models/auth.py | 20 ++++++++++++++++ dumuzid/settings.py | 29 ++++++++++++++++++------ settings.dist.ini | 15 ++++++++++++ 7 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 datastore/managers.py create mode 100644 datastore/migrations/0001_initial.py delete mode 100644 datastore/models.py create mode 100644 datastore/models/__init__.py create mode 100644 datastore/models/auth.py create mode 100644 settings.dist.ini diff --git a/datastore/managers.py b/datastore/managers.py new file mode 100644 index 0000000..115114f --- /dev/null +++ b/datastore/managers.py @@ -0,0 +1,21 @@ +from django.contrib.auth.base_user import BaseUserManager + +class UserManager(BaseUserManager): + def create_user(self, email, **extra_fields): + if not email: + raise ValueError('The Email must be set') + email = self.normalize_email(email) + user = self.model(email=email, **extra_fields) + user.save() + return user + + def create_superuser(self, email, **extra_fields): + extra_fields.setdefault('is_staff', True) + extra_fields.setdefault('is_superuser', True) + extra_fields.setdefault('is_active', True) + + if extra_fields.get('is_staff') is not True: + raise ValueError('Superuser must have is_staff=True.') + if extra_fields.get('is_superuser') is not True: + raise ValueError('Superuser must have is_superuser=True.') + return self.create_user(email, **extra_fields) diff --git a/datastore/migrations/0001_initial.py b/datastore/migrations/0001_initial.py new file mode 100644 index 0000000..2a21b41 --- /dev/null +++ b/datastore/migrations/0001_initial.py @@ -0,0 +1,34 @@ +# Generated by Django 4.1 on 2022-08-08 12:59 + +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='User', + 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')), + ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False)), + ('is_active', models.BooleanField(default=True)), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now)), + ('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={ + 'abstract': False, + }, + ), + ] diff --git a/datastore/models.py b/datastore/models.py deleted file mode 100644 index 71a8362..0000000 --- a/datastore/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/datastore/models/__init__.py b/datastore/models/__init__.py new file mode 100644 index 0000000..611c4d8 --- /dev/null +++ b/datastore/models/__init__.py @@ -0,0 +1 @@ +from .auth import User \ No newline at end of file diff --git a/datastore/models/auth.py b/datastore/models/auth.py new file mode 100644 index 0000000..275eef6 --- /dev/null +++ b/datastore/models/auth.py @@ -0,0 +1,20 @@ +from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin +from django.db import models +from django.utils import timezone + +from ..managers import UserManager + + +class User(AbstractBaseUser, PermissionsMixin): + email = models.EmailField('email address', unique=True) + is_staff = models.BooleanField(default=False) + is_active = models.BooleanField(default=True) + date_joined = models.DateTimeField(default=timezone.now) + + USERNAME_FIELD = 'email' + REQUIRED_FIELDS = [] + + objects = UserManager() + + def __str__(self): + return self.email \ No newline at end of file diff --git a/dumuzid/settings.py b/dumuzid/settings.py index 293626a..d70bbfb 100644 --- a/dumuzid/settings.py +++ b/dumuzid/settings.py @@ -9,9 +9,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent CONFIG_PATH = BASE_DIR / "settings.ini" ASK = AutoSecretKey(CONFIG_PATH) -MONSTERCONFIG = MonsterConfig(CONFIG_PATH) + # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = ASK.config.getboolean("DUMUZID", "Debug", fallback=False) ALLOWED_HOSTS = [] @@ -64,17 +64,32 @@ WSGI_APPLICATION = 'dumuzid.wsgi.application' # Database # https://docs.djangoproject.com/en/4.1/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', +if "MySQL" in ASK.config: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': CONFIG_FILE.config.get("MySQL", "Database"), + 'USER': CONFIG_FILE.config.get("MySQL", "Username"), + 'PASSWORD': CONFIG_FILE.config.get("MySQL", "Password"), + 'HOST': CONFIG_FILE.config.get("MySQL", "Host", fallback="localhost"), + 'PORT': CONFIG_FILE.config.getint("MySQL", "Port", fallback=3306) + } + } + +else: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } } -} # Password validation # https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators +AUTH_USER_MODEL = 'datastore.User' + AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', diff --git a/settings.dist.ini b/settings.dist.ini new file mode 100644 index 0000000..a25cf31 --- /dev/null +++ b/settings.dist.ini @@ -0,0 +1,15 @@ +[DUMUZID] +Debug = 0 + +# [MySQL] +# Database = academon +# Username = academon +# Password = secret123! +# Host = localhost +# Port = 3306 + +# [S3] +# AccessKey = academon +# SecretKey = !!!verysecret!!! +# Bucket = academon +# Endpoint = https://minio.acade.mon \ No newline at end of file