From 6de3f2ab40d13090f34dd239627a1ec3f9a15bb9 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 22 Jul 2020 21:34:19 +0200 Subject: [PATCH] add failed page --- oauth/templates/oauth/failed.html | 11 +++++++++++ oauth/views.py | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 oauth/templates/oauth/failed.html diff --git a/oauth/templates/oauth/failed.html b/oauth/templates/oauth/failed.html new file mode 100644 index 0000000..aee4cd6 --- /dev/null +++ b/oauth/templates/oauth/failed.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block title %}Login Failed{% endblock %} + +{% block content %} +

Login Failed

+ + {% if error %} +

{{ error }}

+ {% endif %} +{% endblock %} diff --git a/oauth/views.py b/oauth/views.py index 50afd74..37c8643 100644 --- a/oauth/views.py +++ b/oauth/views.py @@ -4,7 +4,7 @@ import requests from django.conf import settings from django.contrib.auth import login from django.http.request import HttpRequest -from django.shortcuts import redirect +from django.shortcuts import redirect, render import users from users.models import CustomUser @@ -26,7 +26,8 @@ def register(_): def register_callback(req: HttpRequest): if 'code' not in req.GET or 'error' in req.GET: - return login_fail('') + error = req.GET['error'] if 'error' in req.GET else None + return login_fail(req, error) try: access_token = get_access_token(req.GET['code']) @@ -39,12 +40,11 @@ def register_callback(req: HttpRequest): return redirect('/') except OAuthException as e: logger.error(e) - return login_fail(str(e)) + return login_fail(req, str(e)) -def login_fail(error: str): - # TODO: create login failed page - return redirect('/') +def login_fail(request, error: str = None): + return render(request, "oauth/failed.html", {'error': error}) def validate_user(zeus_id, username) -> CustomUser: