Skip to content

Commit 4e0bdf1

Browse files
committed
fiddle a bit with the oidc->claims view in profile
1 parent 52725e3 commit 4e0bdf1

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/profiles/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
def get_scopes() -> list[str]:
55
validator = BornhackOAuth2Validator()
6-
return ((claim, claim) for claim in sorted(set(validator.oidc_claim_scope.values())))
6+
return ((scope, scope) for scope in sorted(set(validator.oidc_claim_scope.values())) if scope!="openid")
77

88
class OIDCForm(forms.Form):
99
scopes = forms.MultipleChoiceField(
1010
choices=get_scopes,
11-
help_text="Select the scopes to simulate",
11+
help_text="Select the scopes to simulate. The 'openid' scope is always included.",
1212
)

src/profiles/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ def setup(self, *args, **kwargs):
121121
def get_form(self, form_class=None):
122122
if form_class is None:
123123
form_class = self.get_form_class()
124-
self.initial['scopes'] = self.request.GET.getlist(key="scopes")
124+
scopes = self.request.GET.getlist(key="scopes")
125+
self.initial['scopes'] = scopes
125126
return form_class(**self.get_form_kwargs())
126127

127128
def get_context_data(self, **kwargs):
@@ -132,6 +133,7 @@ def get_context_data(self, **kwargs):
132133
if scope in self.request.GET.getlist(key="scopes"):
133134
context["claims"][claim] = value
134135
context["scopes"] = self.scopes
135-
context["active_scopes"] = ["openid"] + sorted(list(set(self.request.GET.getlist(key="scopes"))))
136-
context["all_scopes"] = sorted(list(set(self.scopes.values())))
136+
context["active_scopes"] = ["openid"] + sorted(set(self.request.GET.getlist(key="scopes")))
137+
context["all_scopes"] = sorted(set(self.scopes.values()))
138+
del(context["all_scopes"][context["all_scopes"].index("openid")])
137139
return context

0 commit comments

Comments
 (0)