habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to per-model UUID Primary key, remove UUIDModel (#26)

Browse Source 
* *: migrate to per-model UUID Primary key, remove UUIDModel

* *: fix import order, fix unittests
This commit is contained in:
Jens L
2020-05-20 09:17:06 +02:00
committed by GitHub
parent 13a20478fd
commit 24a3e787dd
104 changed files with 671 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
passbook/flows/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.0.3 on 2020-05-08 18:27
# Generated by Django 3.0.6 on 2020-05-19 22:07
import uuid
@ -19,7 +19,7 @@ class Migration(migrations.Migration):
name="Flow",
fields=[
(
"uuid",
"flow_uuid",
models.UUIDField(
default=uuid.uuid4,
editable=False,
@ -33,10 +33,12 @@ class Migration(migrations.Migration):
"designation",
models.CharField(
choices=[
("AUTHENTICATION", "authentication"),
("ENROLLMENT", "enrollment"),
("RECOVERY", "recovery"),
("PASSWORD_CHANGE", "password_change"),
("authentication", "Authentication"),
("invalidation", "Invalidation"),
("enrollment", "Enrollment"),
("unenrollment", "Unrenollment"),
("recovery", "Recovery"),
("password_change", "Password Change"),
],
max_length=100,
),
@ -52,13 +54,13 @@ class Migration(migrations.Migration):
),
],
options={"verbose_name": "Flow", "verbose_name_plural": "Flows",},
bases=("passbook_policies.policybindingmodel", models.Model),
bases=("passbook_policies.policybindingmodel",),
),
migrations.CreateModel(
name="Stage",
fields=[
(
"uuid",
"stage_uuid",
models.UUIDField(
default=uuid.uuid4,
editable=False,
@ -68,7 +70,6 @@ class Migration(migrations.Migration):
),
("name", models.TextField()),
],
options={"abstract": False,},
),
migrations.CreateModel(
name="FlowStageBinding",
@ -83,7 +84,7 @@ class Migration(migrations.Migration):
),
),
(
"uuid",
"fsb_uuid",
models.UUIDField(
default=uuid.uuid4,
editable=False,
@ -120,7 +121,7 @@ class Migration(migrations.Migration):
"ordering": ["order", "flow"],
"unique_together": {("flow", "stage", "order")},
},
bases=("passbook_policies.policybindingmodel", models.Model),
bases=("passbook_policies.policybindingmodel",),
),
migrations.AddField(
model_name="flow",

26
passbook/flows/migrations/0003_auto_20200509_1258.py
View File

@ -1,26 +0,0 @@
# Generated by Django 3.0.3 on 2020-05-09 12:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("passbook_flows", "0002_default_flows"),
]
operations = [
migrations.AlterField(
model_name="flow",
name="designation",
field=models.CharField(
choices=[
("authentication", "Authentication"),
("enrollment", "Enrollment"),
("recovery", "Recovery"),
("password_change", "Password Change"),
],
max_length=100,
),
),
]

27
passbook/flows/migrations/0004_auto_20200510_2310.py
View File

@ -1,27 +0,0 @@
# Generated by Django 3.0.5 on 2020-05-10 23:10
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("passbook_flows", "0003_auto_20200509_1258"),
]
operations = [
migrations.AlterField(
model_name="flow",
name="designation",
field=models.CharField(
choices=[
("authentication", "Authentication"),
("enrollment", "Enrollment"),
("recovery", "Recovery"),
("password_change", "Password Change"),
("invalidation", "Invalidation"),
],
max_length=100,
),
),
]

28
passbook/flows/migrations/0005_auto_20200512_1158.py
View File

@ -1,28 +0,0 @@
# Generated by Django 3.0.5 on 2020-05-12 11:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("passbook_flows", "0004_auto_20200510_2310"),
]
operations = [
migrations.AlterField(
model_name="flow",
name="designation",
field=models.CharField(
choices=[
("authentication", "Authentication"),
("invalidation", "Invalidation"),
("enrollment", "Enrollment"),
("unenrollment", "Unrenollment"),
("recovery", "Recovery"),
("password_change", "Password Change"),
],
max_length=100,
),
),
]

14
passbook/flows/models.py
View File

@ -1,12 +1,12 @@
"""Flow models"""
from typing import Optional
from uuid import uuid4
from django.db import models
from django.utils.translation import gettext_lazy as _
from model_utils.managers import InheritanceManager
from passbook.core.types import UIUserSettings
from passbook.lib.models import UUIDModel
from passbook.policies.models import PolicyBindingModel
@ -22,10 +22,12 @@ class FlowDesignation(models.TextChoices):
PASSWORD_CHANGE = "password_change" # nosec # noqa
class Stage(UUIDModel):
class Stage(models.Model):
"""Stage is an instance of a component used in a flow. This can verify the user,
enroll the user or offer a way of recovery"""
stage_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4)
name = models.TextField()
objects = InheritanceManager()
@ -42,11 +44,13 @@ class Stage(UUIDModel):
return f"Stage {self.name}"
class Flow(PolicyBindingModel, UUIDModel):
class Flow(PolicyBindingModel):
"""Flow describes how a series of Stages should be executed to authenticate/enroll/recover
a user. Additionally, policies can be applied, to specify which users
have access to this flow."""
flow_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4)
name = models.TextField()
slug = models.SlugField(unique=True)
@ -72,11 +76,13 @@ class Flow(PolicyBindingModel, UUIDModel):
verbose_name_plural = _("Flows")
class FlowStageBinding(PolicyBindingModel, UUIDModel):
class FlowStageBinding(PolicyBindingModel):
"""Relationship between Flow and Stage. Order is required and unique for
each flow-stage Binding. Additionally, policies can be specified, which determine if
this Binding applies to the current user"""
fsb_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4)
flow = models.ForeignKey("Flow", on_delete=models.CASCADE)
stage = models.ForeignKey(Stage, on_delete=models.CASCADE)