stages/user_delete: fix formatting
This commit is contained in:
parent
e45b33c6c2
commit
57fed2b92b
|
@ -28,4 +28,3 @@ class TestUserViews(TestCase):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
self.client.get(reverse("passbook_core:user-settings")).status_code, 200
|
self.client.get(reverse("passbook_core:user-settings")).status_code, 200
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
"""passbook core user views"""
|
"""passbook core user views"""
|
||||||
from django.contrib import messages
|
|
||||||
from django.contrib.auth import logout
|
|
||||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||||
from django.contrib.messages.views import SuccessMessageMixin
|
from django.contrib.messages.views import SuccessMessageMixin
|
||||||
from django.shortcuts import reverse
|
|
||||||
from django.urls import reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.views.generic import DeleteView, UpdateView
|
from django.views.generic import UpdateView
|
||||||
|
|
||||||
from passbook.core.forms.users import UserDetailForm
|
from passbook.core.forms.users import UserDetailForm
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,23 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('passbook_flows', '0004_auto_20200510_2310'),
|
("passbook_flows", "0004_auto_20200510_2310"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='flow',
|
model_name="flow",
|
||||||
name='designation',
|
name="designation",
|
||||||
field=models.CharField(choices=[('authentication', 'Authentication'), ('invalidation', 'Invalidation'), ('enrollment', 'Enrollment'), ('unenrollment', 'Unrenollment'), ('recovery', 'Recovery'), ('password_change', 'Password Change')], max_length=100),
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("authentication", "Authentication"),
|
||||||
|
("invalidation", "Invalidation"),
|
||||||
|
("enrollment", "Enrollment"),
|
||||||
|
("unenrollment", "Unrenollment"),
|
||||||
|
("recovery", "Recovery"),
|
||||||
|
("password_change", "Password Change"),
|
||||||
|
],
|
||||||
|
max_length=100,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,9 @@ from passbook.root.monitoring import MetricsView
|
||||||
|
|
||||||
LOGGER = get_logger()
|
LOGGER = get_logger()
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
admin.site.login = RedirectView.as_view(pattern_name="passbook_flows:default-authentication")
|
admin.site.login = RedirectView.as_view(
|
||||||
|
pattern_name="passbook_flows:default-authentication"
|
||||||
|
)
|
||||||
admin.site.logout = RedirectView.as_view(
|
admin.site.logout = RedirectView.as_view(
|
||||||
pattern_name="passbook_flows:default-invalidate"
|
pattern_name="passbook_flows:default-invalidate"
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Generated by Django 3.0.5 on 2020-05-12 11:59
|
# Generated by Django 3.0.5 on 2020-05-12 11:59
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -9,19 +9,29 @@ class Migration(migrations.Migration):
|
||||||
initial = True
|
initial = True
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('passbook_flows', '0005_auto_20200512_1158'),
|
("passbook_flows", "0005_auto_20200512_1158"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='UserDeleteStage',
|
name="UserDeleteStage",
|
||||||
fields=[
|
fields=[
|
||||||
('stage_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='passbook_flows.Stage')),
|
(
|
||||||
|
"stage_ptr",
|
||||||
|
models.OneToOneField(
|
||||||
|
auto_created=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
parent_link=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
to="passbook_flows.Stage",
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'User Delete Stage',
|
"verbose_name": "User Delete Stage",
|
||||||
'verbose_name_plural': 'User Delete Stages',
|
"verbose_name_plural": "User Delete Stages",
|
||||||
},
|
},
|
||||||
bases=('passbook_flows.stage',),
|
bases=("passbook_flows.stage",),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
"""Delete stage logic"""
|
"""Delete stage logic"""
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.auth.backends import ModelBackend
|
|
||||||
from django.http import HttpRequest, HttpResponse
|
from django.http import HttpRequest, HttpResponse
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
|
from django.views.generic import FormView
|
||||||
from structlog import get_logger
|
from structlog import get_logger
|
||||||
|
|
||||||
from django.views.generic import FormView
|
|
||||||
from passbook.core.models import User
|
from passbook.core.models import User
|
||||||
from passbook.flows.planner import PLAN_CONTEXT_PENDING_USER
|
from passbook.flows.planner import PLAN_CONTEXT_PENDING_USER
|
||||||
from passbook.flows.stage import AuthenticationStage
|
from passbook.flows.stage import AuthenticationStage
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
"""delete tests"""
|
"""delete tests"""
|
||||||
import string
|
|
||||||
from random import SystemRandom
|
|
||||||
|
|
||||||
from django.shortcuts import reverse
|
from django.shortcuts import reverse
|
||||||
from django.test import Client, TestCase
|
from django.test import Client, TestCase
|
||||||
|
|
||||||
|
@ -9,8 +6,6 @@ from passbook.core.models import User
|
||||||
from passbook.flows.models import Flow, FlowDesignation, FlowStageBinding
|
from passbook.flows.models import Flow, FlowDesignation, FlowStageBinding
|
||||||
from passbook.flows.planner import PLAN_CONTEXT_PENDING_USER, FlowPlan
|
from passbook.flows.planner import PLAN_CONTEXT_PENDING_USER, FlowPlan
|
||||||
from passbook.flows.views import SESSION_KEY_PLAN
|
from passbook.flows.views import SESSION_KEY_PLAN
|
||||||
from passbook.stages.prompt.stage import PLAN_CONTEXT_PROMPT
|
|
||||||
from passbook.stages.user_delete.forms import UserDeleteStageForm
|
|
||||||
from passbook.stages.user_delete.models import UserDeleteStage
|
from passbook.stages.user_delete.models import UserDeleteStage
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +14,7 @@ class TestUserDeleteStage(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super().setUp()
|
super().setUp()
|
||||||
self.username = 'qerqwerqrwqwerwq'
|
self.username = "qerqwerqrwqwerwq"
|
||||||
self.user = User.objects.create(username=self.username, email="test@beryju.org")
|
self.user = User.objects.create(username=self.username, email="test@beryju.org")
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
|
|
||||||
|
@ -58,7 +53,7 @@ class TestUserDeleteStage(TestCase):
|
||||||
reverse(
|
reverse(
|
||||||
"passbook_flows:flow-executor", kwargs={"flow_slug": self.flow.slug}
|
"passbook_flows:flow-executor", kwargs={"flow_slug": self.flow.slug}
|
||||||
),
|
),
|
||||||
{}
|
{},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertFalse(User.objects.filter(username=self.username).exists())
|
self.assertFalse(User.objects.filter(username=self.username).exists())
|
||||||
|
|
Reference in New Issue