From fa4c95e97dd5bb22666836fbc207d913cc3645bd Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 16 Apr 2016 17:53:28 -0300 Subject: [PATCH] Modify example project template. Conflicts: example_project/provider_app/templates/base.html example_project/provider_app/templates/login.html example_project/provider_app/templates/oidc_provider/authorize.html example_project/provider_app/templates/oidc_provider/error.html --- example_project/README.md | 2 +- .../provider_app/static/css/custom.css | 25 +++----- .../provider_app/templates/base.html | 58 ++++++++++--------- .../provider_app/templates/home.html | 55 +++++------------- .../provider_app/templates/login.html | 50 +++++++++------- .../templates/oidc_provider/authorize.html | 37 ++++++------ .../templates/oidc_provider/error.html | 11 ++-- 7 files changed, 109 insertions(+), 129 deletions(-) diff --git a/example_project/README.md b/example_project/README.md index cad83d3..ab1fd6c 100644 --- a/example_project/README.md +++ b/example_project/README.md @@ -1,6 +1,6 @@ # Example Project -![Example Project](http://s12.postimg.org/e4uwlsi0d/Screenshot_from_2016_02_02_13_15_26.png) +![Example Project](http://i.imgur.com/IK3OZjx.png) Run your own OIDC provider in a second. This is a Django app with all the necessary things to work with `django-oidc-provider` package. diff --git a/example_project/provider_app/static/css/custom.css b/example_project/provider_app/static/css/custom.css index e522417..0f6eaa3 100644 --- a/example_project/provider_app/static/css/custom.css +++ b/example_project/provider_app/static/css/custom.css @@ -1,22 +1,15 @@ -@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,800); - -html { - font-size: 16px; -} - body { - font-family: 'Open Sans', sans-serif; - font-weight: 400; - height: auto; - padding-top: 10px; + background-color: #536dfe; + display: flex; + min-height: 100vh; + flex-direction: column; } -.ui.huge.header { - font-size: 46px; - font-weight: 800; +#main-container { + flex: 1 0 auto; + padding-top: 40px; } -.ui.segment { - font-size: 18px; - font-weight: 300; +footer { + padding-top: 0px !important; } \ No newline at end of file diff --git a/example_project/provider_app/templates/base.html b/example_project/provider_app/templates/base.html index d0c1cf1..bc5903d 100644 --- a/example_project/provider_app/templates/base.html +++ b/example_project/provider_app/templates/base.html @@ -6,42 +6,46 @@ - - + - OIDC Provider Example + OpenID Provider Example - + + -
- django-oidc-provider -
- {% if user.is_authenticated %} - {{ user.email }} - {% if user.is_superuser %} - Admin - {% endif %} - - {% else %} - Login - {% endif %} -
-
- {% block content %}{% endblock %} - -
-
-
- View the project on Github. Example by Juan Ignacio Fiorentino. +
+
+
- - +
+ {% block content %}{% endblock %} +
+ + + + + \ No newline at end of file diff --git a/example_project/provider_app/templates/home.html b/example_project/provider_app/templates/home.html index 7ede9e4..ec76385 100644 --- a/example_project/provider_app/templates/home.html +++ b/example_project/provider_app/templates/home.html @@ -4,46 +4,21 @@ {% block content %} -
-
-
- -

Congratulations! It works.
... what's next?

-
-
-
-
-
-
-

Now that you are an OpenID Connect Provider, start by creating your clients here.

-

Also check that you've created at least one server key, do it here.

-

Server Endpoints

-
-
- {% url 'oidc_provider:provider_info' %} -
The configuration information of the provider. Read more.
-
-
- {% url 'oidc_provider:jwks' %} -
JavaScript Object Notation (JSON) data structure that represents a cryptographic key.
-
-
- {% url 'oidc_provider:authorize' %} -
This endpoint performs Authentication of the End-User. Read more.
-
-
- {% url 'oidc_provider:token' %} -
Used to obtain an Access Token, an ID Token, and optionally a Refresh Token. Read more.
-
-
- {% url 'oidc_provider:userinfo' %} -
OAuth 2.0 Protected Resource that returns Claims about the authenticated End-User. Read more.
-
-
- {% url 'oidc_provider:logout' %} -
Used to notify the OP that the End-User has logged out of the site. Read more.
-
-
+
+
+
+
+

Example of an OpenID Connect 1.0 Provider. Built with the Django Framework and django-oidc-provider package.

+

Start by creating your clients here.

+

Also check that you've created at least one server key, do it here.

+
+

Server Endpoints

+ {% url 'oidc_provider:provider_info' %} + {% url 'oidc_provider:jwks' %} + {% url 'oidc_provider:authorize' %} + {% url 'oidc_provider:token' %} + {% url 'oidc_provider:userinfo' %} + {% url 'oidc_provider:logout' %}
diff --git a/example_project/provider_app/templates/login.html b/example_project/provider_app/templates/login.html index 8f3b7a9..e9708ca 100644 --- a/example_project/provider_app/templates/login.html +++ b/example_project/provider_app/templates/login.html @@ -1,28 +1,38 @@ {% extends 'base.html' %} +{% load i18n %} + {% block content %} -
-
-
- {% if form.errors %} -
-

Your username and password didn't match. Please try again.

+
+
+
+
+
+ {% if form.errors %} +
Your username and password didn't match. Please try again.
+ {% endif %} +
+ {% csrf_token %} + +
+
+ account_circle + + +
+
+
+
+ lock + + +
+
+ +
+
- {% endif %} -
- {% csrf_token %} - -
- - -
-
- - -
- -
diff --git a/example_project/provider_app/templates/oidc_provider/authorize.html b/example_project/provider_app/templates/oidc_provider/authorize.html index 6df2ed5..3e2a8b3 100644 --- a/example_project/provider_app/templates/oidc_provider/authorize.html +++ b/example_project/provider_app/templates/oidc_provider/authorize.html @@ -2,25 +2,24 @@ {% 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..31a221c 100644 --- a/example_project/provider_app/templates/oidc_provider/error.html +++ b/example_project/provider_app/templates/oidc_provider/error.html @@ -2,12 +2,11 @@ {% block content %} -
-
-
- -
-
{{ error }}
+
+
+
+
+

{{ error }}

{{ description }}