trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stages/consent: support pending_user from flow

This commit is contained in:
Jens Langhammer 2020-09-26 20:43:41 +02:00
parent 3663c3c8a1
commit ea1564548c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
passbook/stages/consent/stage.py
View File

@ -5,7 +5,7 @@ from django.http import HttpRequest, HttpResponse
from django.utils.timezone import now from django.utils.timezone import now
from django.views.generic import FormView from django.views.generic import FormView
from passbook.flows.planner import PLAN_CONTEXT_APPLICATION from passbook.flows.planner import PLAN_CONTEXT_APPLICATION, PLAN_CONTEXT_PENDING_USER
from passbook.flows.stage import StageView from passbook.flows.stage import StageView
from passbook.lib.utils.time import timedelta_from_string from passbook.lib.utils.time import timedelta_from_string
from passbook.stages.consent.forms import ConsentForm from passbook.stages.consent.forms import ConsentForm
@ -26,6 +26,8 @@ class ConsentStageView(FormView, StageView):
return kwargs return kwargs
def get_template_names(self) -> List[str]: def get_template_names(self) -> List[str]:
# PLAN_CONTEXT_CONSENT_TEMPLATE has to be set by a template that calls this stage
# TODO: Add a default template in case a user directly implements this stage
if PLAN_CONTEXT_CONSENT_TEMPLATE in self.executor.plan.context: if PLAN_CONTEXT_CONSENT_TEMPLATE in self.executor.plan.context:
template_name = self.executor.plan.context[PLAN_CONTEXT_CONSENT_TEMPLATE] template_name = self.executor.plan.context[PLAN_CONTEXT_CONSENT_TEMPLATE]
return [template_name] return [template_name]
@ -42,9 +44,13 @@ class ConsentStageView(FormView, StageView):
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
application = self.executor.plan.context[PLAN_CONTEXT_APPLICATION] application = self.executor.plan.context[PLAN_CONTEXT_APPLICATION]
# TODO: Check for user in plan?
user = self.request.user
if PLAN_CONTEXT_PENDING_USER in self.executor.plan.context:
user = self.executor.plan.context[PLAN_CONTEXT_PENDING_USER]
if UserConsent.filter_not_expired( if UserConsent.filter_not_expired(
user=self.request.user, application=application user=user, application=application
).exists(): ).exists():
return self.executor.stage_ok() return self.executor.stage_ok()

1
passbook/stages/otp_static/views.py
View File

@ -16,7 +16,6 @@ class UserSettingsView(LoginRequiredMixin, TemplateView):
template_name = "stages/otp_static/user_settings.html" template_name = "stages/otp_static/user_settings.html"
# TODO: Check if OTP Stage exists and applies to user
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs) kwargs = super().get_context_data(**kwargs)
stage = get_object_or_404(OTPStaticStage, pk=self.kwargs["stage_uuid"]) stage = get_object_or_404(OTPStaticStage, pk=self.kwargs["stage_uuid"])

1
passbook/stages/otp_time/views.py
View File

@ -16,7 +16,6 @@ class UserSettingsView(LoginRequiredMixin, TemplateView):
template_name = "stages/otp_time/user_settings.html" template_name = "stages/otp_time/user_settings.html"
# TODO: Check if OTP Stage exists and applies to user
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs) kwargs = super().get_context_data(**kwargs)
stage = get_object_or_404(OTPTimeStage, pk=self.kwargs["stage_uuid"]) stage = get_object_or_404(OTPTimeStage, pk=self.kwargs["stage_uuid"])