From 2fb8c914157effa9d8dc321acab8bc0fce1b1ce9 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Sat, 17 Nov 2018 23:00:36 +0100
Subject: [PATCH] Change OTPSeed to AbstractUser

---
 ungleichotp/otpauth/admin.py                  | 11 +++++---
 .../otpauth/migrations/0001_initial.py        | 27 -------------------
 ungleichotp/otpauth/migrations/__init__.py    |  0
 ungleichotp/otpauth/models.py                 |  3 +--
 ungleichotp/ungleichotp/settings.py           |  2 ++
 5 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 ungleichotp/otpauth/migrations/0001_initial.py
 delete mode 100644 ungleichotp/otpauth/migrations/__init__.py

diff --git a/ungleichotp/otpauth/admin.py b/ungleichotp/otpauth/admin.py
index e89a5d7..fc9d230 100644
--- a/ungleichotp/otpauth/admin.py
+++ b/ungleichotp/otpauth/admin.py
@@ -1,9 +1,14 @@
 from django.contrib import admin
 
-# Register your models here.
 
 from django.contrib import admin
-
+from django.contrib.auth.admin import UserAdmin
 from .models import OTPSeed
 
-admin.site.register(OTPSeed)
+#admin.site.register(OTPSeed)
+
+
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+
+admin.site.register(OTPSeed, UserAdmin)
diff --git a/ungleichotp/otpauth/migrations/0001_initial.py b/ungleichotp/otpauth/migrations/0001_initial.py
deleted file mode 100644
index 17505ad..0000000
--- a/ungleichotp/otpauth/migrations/0001_initial.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 2.1.3 on 2018-11-17 09:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='OTPSeed',
-            fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128)),
-                ('realm', models.CharField(max_length=128)),
-                ('seed', models.CharField(max_length=128)),
-            ],
-        ),
-        migrations.AlterUniqueTogether(
-            name='otpseed',
-            unique_together={('name', 'realm')},
-        ),
-    ]
diff --git a/ungleichotp/otpauth/migrations/__init__.py b/ungleichotp/otpauth/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ungleichotp/otpauth/models.py b/ungleichotp/otpauth/models.py
index 8075db0..50080e0 100644
--- a/ungleichotp/otpauth/models.py
+++ b/ungleichotp/otpauth/models.py
@@ -2,7 +2,7 @@ from django.db import models
 from django.contrib.auth.models import AbstractUser
 
 # Create your models here.
-class OTPSeed(models.Model):
+class OTPSeed(AbstractUser):
     id       = models.AutoField(primary_key=True)
     name     = models.CharField(max_length=128)
     realm    = models.CharField(max_length=128)
@@ -14,7 +14,6 @@ class OTPSeed(models.Model):
     def __str__(self):
         return "'{}'@{}".format(self.name, self.realm)
 
-# class OTPUser(AbstractUser, OTPSeed):
 #     @classmethod
 #     def get_username(cls):
 #         pass
diff --git a/ungleichotp/ungleichotp/settings.py b/ungleichotp/ungleichotp/settings.py
index 61d8119..a8dc786 100644
--- a/ungleichotp/ungleichotp/settings.py
+++ b/ungleichotp/ungleichotp/settings.py
@@ -120,3 +120,5 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 
 STATIC_URL = '/static/'
+
+AUTH_USER_MODEL = 'otpauth.OTPSeed'