Skip to content

Added Proof Key for Code Exchange extension #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManuTrt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added Proof Key for Code Exchange extension #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readerbench/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore',
# this is the list of available scopes
'SCOPES': {'read': 'Read scope', 'write': 'Write scope', 'groups': 'Access to your groups'},
'PKCE_REQUIRED': False
'PKCE_REQUIRED': True
}

REST_FRAMEWORK = {
Expand Down
2 changes: 1 addition & 1 deletion templates/registration/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

<div class="card-footer text-center pt-0 px-lg-2 px-1">
<p class="mb-1 text-sm mx-auto">
Don't have an account? <a href="{% if client_id %}{% url 'signup' %}?client_id={{ client_id }}&redirect_uri={{redirect_uri}}{% else %}{% url 'signup' %}{% endif %}"
Don't have an account? <a href="{% if client_id %}{% url 'signup' %}?client_id={{ client_id }}&redirect_uri={{redirect_uri}}&code_challenge={{ code_challenge }}&code_challenge_method={{ code_challenge_method }}{% else %}{% url 'signup' %}{% endif %}"
class="text-primary text-gradient font-weight-bold">Sign Up</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/registration/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@

<div class="card-footer text-center pt-0 px-lg-2 px-1">
<p class="mb-4 text-sm mx-auto">
Already have an account? <a href="{% if client_id %}{% url 'login' %}?client_id={{ client_id }}&redirect_uri={{redirect_uri}}{% else %}{% url 'login' %}{% endif %}"
Already have an account? <a href="{% if client_id %}{% url 'login' %}?client_id={{ client_id }}&redirect_uri={{redirect_uri}}&code_challenge={{ code_challenge }}&code_challenge_method={{ code_challenge_method }}{% else %}{% url 'login' %}{% endif %}"
class="text-primary text-gradient font-weight-bold">Sign In</a>
</p>
</div>
Expand Down
41 changes: 33 additions & 8 deletions users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ def form_valid(self, form):
if not redirect_uri:
messages.error(self.request, 'redirect_uri is missing.')
return super().form_invalid(form)

code_challenge = self.request.GET.get('code_challenge')
if not code_challenge:
messages.error(self.request, 'code_challenge is missing.')
return super().form_invalid(form)

code_challenge_method = self.request.GET.get('code_challenge_method')
if not code_challenge_method:
messages.error(self.request, 'code_challenge_method is missing.')
return super().form_invalid(form)


super().form_valid(form)

Expand All @@ -34,15 +45,17 @@ def form_valid(self, form):
f"?client_id={client_id}"
f"&response_type=code"
f"&redirect_uri={redirect_uri}"
f"&code_challenge={code_challenge}"
f"&code_challenge_method={code_challenge_method}"
)
return redirect(authorization_url)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
client_id = self.request.GET.get('client_id')
context['client_id'] = client_id
redirect_uri = self.request.GET.get('redirect_uri')
context['redirect_uri'] = redirect_uri
context['client_id'] = self.request.GET.get('client_id')
context['redirect_uri'] = self.request.GET.get('redirect_uri')
context['code_challenge'] = self.request.GET.get('code_challenge')
context['code_challenge_method'] = self.request.GET.get('code_challenge_method')
return context


Expand All @@ -61,6 +74,16 @@ def form_valid(self, form):
if not redirect_uri:
messages.error(self.request, 'redirect_uri is missing.')
return redirect('signup')

code_challenge = self.request.GET.get('code_challenge')
if not code_challenge:
messages.error(self.request, 'code_challenge is missing.')
return super().form_invalid(form)

code_challenge_method = self.request.GET.get('code_challenge_method')
if not code_challenge_method:
messages.error(self.request, 'code_challenge_method is missing.')
return super().form_invalid(form)

# Save the new user
user = form.save()
Expand All @@ -73,6 +96,8 @@ def form_valid(self, form):
f"?client_id={client_id}"
f"&response_type=code"
f"&redirect_uri={redirect_uri}"
f"&code_challenge={code_challenge}"
f"&code_challenge_method={code_challenge_method}"
)
return redirect(authorization_url)

Expand All @@ -82,10 +107,10 @@ def form_invalid(self, form):

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
client_id = self.request.GET.get('client_id')
context['client_id'] = client_id
redirect_uri = self.request.GET.get('redirect_uri')
context['redirect_uri'] = redirect_uri
context['client_id'] = self.request.GET.get('client_id')
context['redirect_uri'] = self.request.GET.get('redirect_uri')
context['code_challenge'] = self.request.GET.get('code_challenge')
context['code_challenge_method'] = self.request.GET.get('code_challenge_method')
return context

# removes session from database
Expand Down