From 93c0bc2382174d274fe501f5a014f017bab475a9 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Wed, 6 Apr 2016 21:28:13 -0300 Subject: [PATCH] Fix in example project. --- example_project/provider_app/settings.py | 2 + .../provider_app/templates/base.html | 5 +-- .../templates/oidc_provider/authorize.html | 40 ++++++++++--------- .../templates/oidc_provider/error.html | 18 +++++---- example_project/provider_app/urls.py | 4 +- 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/example_project/provider_app/settings.py b/example_project/provider_app/settings.py index d2a28af..ec0c26f 100644 --- a/example_project/provider_app/settings.py +++ b/example_project/provider_app/settings.py @@ -87,3 +87,5 @@ LOGIN_REDIRECT_URL = '/' # OIDC Provider settings SITE_URL = 'http://localhost:8000' + +LOGIN_URL = '/admin/login/' diff --git a/example_project/provider_app/templates/base.html b/example_project/provider_app/templates/base.html index d0c1cf1..92ef156 100644 --- a/example_project/provider_app/templates/base.html +++ b/example_project/provider_app/templates/base.html @@ -19,13 +19,12 @@ django-oidc-provider
{% if user.is_authenticated %} - {{ user.email }} {% if user.is_superuser %} Admin {% endif %} - + {% else %} - Login + Login {% endif %}
diff --git a/example_project/provider_app/templates/oidc_provider/authorize.html b/example_project/provider_app/templates/oidc_provider/authorize.html index 6df2ed5..6bbab77 100644 --- a/example_project/provider_app/templates/oidc_provider/authorize.html +++ b/example_project/provider_app/templates/oidc_provider/authorize.html @@ -2,25 +2,29 @@ {% block content %} -
-
-
-

Request for Permission

-

Client {{ client.name }} would like to access this information of you.

-
- {% csrf_token %} - {{ hidden_inputs }} -
- {% for scope in params.scope %} -
{{ scope | capfirst }}
- {% endfor %} +
+
+
+
+
+

Request for Permission

+

Client {{ client.name }} would like to access this information of you.

+ + {% csrf_token %} + {{ hidden_inputs }} +
+ {% for scope in params.scope %} +
{{ scope | capfirst }}
+ {% endfor %} +
+
+ +
+ +
+
-
- -
- -
- +
diff --git a/example_project/provider_app/templates/oidc_provider/error.html b/example_project/provider_app/templates/oidc_provider/error.html index 1dfc227..ce1eeb6 100644 --- a/example_project/provider_app/templates/oidc_provider/error.html +++ b/example_project/provider_app/templates/oidc_provider/error.html @@ -2,13 +2,17 @@ {% block content %} -
-
-
- -
-
{{ error }}
-

{{ description }}

+
+
+
+
+
+ +
+
{{ error }}
+

{{ description }}

+
+
diff --git a/example_project/provider_app/urls.py b/example_project/provider_app/urls.py index 1757fa8..60d246c 100644 --- a/example_project/provider_app/urls.py +++ b/example_project/provider_app/urls.py @@ -6,10 +6,8 @@ from django.views.generic import TemplateView urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'), - url(r'^accounts/login/$', auth_views.login, { 'template_name': 'login.html' }, name='login'), - url(r'^accounts/logout/$', auth_views.logout, { 'next_page': '/' }, name='logout'), - url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')), + url(r'^', include('oidc_provider.urls', namespace='oidc_provider')), url(r'^admin/', include(admin.site.urls)), ]