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

flows: allow blank on WithUserInfo 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-05-25 12:53:48 +02:00
parent 58a4b20297
commit 6f3eb4c068
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
authentik/flows/challenge.py
View File

@ -61,7 +61,7 @@ class ShellChallenge(Challenge):
class WithUserInfoChallenge(Challenge): class WithUserInfoChallenge(Challenge):
"""Challenge base which shows some user info""" """Challenge base which shows some user info"""
pending_user = CharField() pending_user = CharField(allow_blank=True)
pending_user_avatar = CharField() pending_user_avatar = CharField()

7
authentik/sources/saml/views.py
View File

@ -8,7 +8,6 @@ from django.http.response import HttpResponseBadRequest
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import gettext_lazy as _
from django.views import View from django.views import View
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from structlog.stdlib import get_logger from structlog.stdlib import get_logger
@ -134,10 +133,8 @@ class InitiateView(View):
return bad_request_message(request, str(exc)) return bad_request_message(request, str(exc))
injected_stages = [] injected_stages = []
plan_kwargs = { plan_kwargs = {
PLAN_CONTEXT_TITLE: _("Redirecting to %(app)s..." % {"app": source.name}), PLAN_CONTEXT_TITLE: f"Redirecting to {source.name}...",
PLAN_CONTEXT_CONSENT_TITLE: _( PLAN_CONTEXT_CONSENT_TITLE: f"Redirecting to {source.name}...",
"Redirecting to %(app)s..." % {"app": source.name}
),
PLAN_CONTEXT_ATTRS: { PLAN_CONTEXT_ATTRS: {
"SAMLRequest": saml_request, "SAMLRequest": saml_request,
"RelayState": relay_state, "RelayState": relay_state,

22
authentik/stages/consent/stage.py
View File

@ -40,23 +40,19 @@ class ConsentStageView(ChallengeStageView):
response_class = ConsentChallengeResponse response_class = ConsentChallengeResponse
def get_challenge(self) -> Challenge: def get_challenge(self) -> Challenge:
challenge = ConsentChallenge( data = {
data={ "type": ChallengeTypes.NATIVE.value,
"type": ChallengeTypes.NATIVE.value, "permissions": self.executor.plan.context.get(
} PLAN_CONTEXT_CONSENT_PERMISSIONS, []
) ),
}
if PLAN_CONTEXT_CONSENT_TITLE in self.executor.plan.context: if PLAN_CONTEXT_CONSENT_TITLE in self.executor.plan.context:
challenge.initial_data["title"] = self.executor.plan.context[ data["title"] = self.executor.plan.context[PLAN_CONTEXT_CONSENT_TITLE]
PLAN_CONTEXT_CONSENT_TITLE
]
if PLAN_CONTEXT_CONSENT_HEADER in self.executor.plan.context: if PLAN_CONTEXT_CONSENT_HEADER in self.executor.plan.context:
challenge.initial_data["header_text"] = self.executor.plan.context[ data["header_text"] = self.executor.plan.context[
PLAN_CONTEXT_CONSENT_HEADER PLAN_CONTEXT_CONSENT_HEADER
] ]
if PLAN_CONTEXT_CONSENT_PERMISSIONS in self.executor.plan.context: challenge = ConsentChallenge(data=data)
challenge.initial_data["permissions"] = self.executor.plan.context[
PLAN_CONTEXT_CONSENT_PERMISSIONS
]
return challenge return challenge
def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse: def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse: