From b803f8917d3ccc834399c10b35f56c0742eb1f01 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Fiorentino Date: Fri, 23 Mar 2018 17:06:44 -0300 Subject: [PATCH] Update example project. --- {example_project => example}/.gitignore | 0 {example_project => example}/Dockerfile | 2 +- {example_project => example}/README.md | 11 ++++------- {example_project/myapp => example/app}/__init__.py | 0 {example_project/myapp => example/app}/settings.py | 6 +++--- .../myapp => example/app}/templates/base.html | 0 .../myapp => example/app}/templates/home.html | 2 +- .../myapp => example/app}/templates/login.html | 0 .../app}/templates/oidc_provider/authorize.html | 0 .../app}/templates/oidc_provider/error.html | 0 {example_project/myapp => example/app}/urls.py | 0 {example_project/myapp => example/app}/wsgi.py | 4 +++- {example_project => example}/manage.py | 2 +- example/requirements.txt | 2 ++ example_project/requirements.txt | 2 -- 15 files changed, 15 insertions(+), 16 deletions(-) rename {example_project => example}/.gitignore (100%) rename {example_project => example}/Dockerfile (87%) rename {example_project => example}/README.md (75%) rename {example_project/myapp => example/app}/__init__.py (100%) rename {example_project/myapp => example/app}/settings.py (95%) rename {example_project/myapp => example/app}/templates/base.html (100%) rename {example_project/myapp => example/app}/templates/home.html (95%) rename {example_project/myapp => example/app}/templates/login.html (100%) rename {example_project/myapp => example/app}/templates/oidc_provider/authorize.html (100%) rename {example_project/myapp => example/app}/templates/oidc_provider/error.html (100%) rename {example_project/myapp => example/app}/urls.py (100%) rename {example_project/myapp => example/app}/wsgi.py (60%) rename {example_project => example}/manage.py (71%) create mode 100644 example/requirements.txt delete mode 100644 example_project/requirements.txt diff --git a/example_project/.gitignore b/example/.gitignore similarity index 100% rename from example_project/.gitignore rename to example/.gitignore diff --git a/example_project/Dockerfile b/example/Dockerfile similarity index 87% rename from example_project/Dockerfile rename to example/Dockerfile index a636e93..abe0b7e 100644 --- a/example_project/Dockerfile +++ b/example/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2-onbuild +FROM python:3-onbuild RUN [ "python", "manage.py", "migrate" ] RUN [ "python", "manage.py", "creatersakey" ] diff --git a/example_project/README.md b/example/README.md similarity index 75% rename from example_project/README.md rename to example/README.md index 0a8dfef..c3f78c7 100644 --- a/example_project/README.md +++ b/example/README.md @@ -2,7 +2,7 @@ ![Example Project](https://s17.postimg.org/4jjj8lavj/Screen_Shot_2016_09_07_at_15_58_43.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. +On this example you'll be running your own OIDC provider in a second. This is a Django app with all the necessary things to work with `django-oidc-provider` package. ## Setup & Running @@ -14,15 +14,12 @@ Run your own OIDC provider in a second. This is a Django app with all the necess Setup project environment with [virtualenv](https://virtualenv.pypa.io) and [pip](https://pip.pypa.io). ```bash -# For Python 2.7. -$ virtualenv project_env -# Or Python 3. -$ virtualenv -p /usr/bin/python3.4 project_env +$ virtualenv -p /usr/bin/python3 project_env $ source project_env/bin/activate $ git clone https://github.com/juanifioren/django-oidc-provider.git -$ cd django-oidc-provider/example_project +$ cd django-oidc-provider/example $ pip install -r requirements.txt ``` @@ -53,7 +50,7 @@ After you run `pip install -r requirements.txt`. # Remove pypi package. $ pip uninstall django-oidc-provider -# Go back and add the package again. +# Go back to django-oidc-provider/ folder and add the package on editable mode. $ cd .. $ pip install -e . ``` diff --git a/example_project/myapp/__init__.py b/example/app/__init__.py similarity index 100% rename from example_project/myapp/__init__.py rename to example/app/__init__.py diff --git a/example_project/myapp/settings.py b/example/app/settings.py similarity index 95% rename from example_project/myapp/settings.py rename to example/app/settings.py index 8d531d9..1c3e972 100644 --- a/example_project/myapp/settings.py +++ b/example/app/settings.py @@ -20,7 +20,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'myapp', + 'app', 'oidc_provider', ] @@ -51,9 +51,9 @@ TEMPLATES = [ }, ] -ROOT_URLCONF = 'myapp.urls' +ROOT_URLCONF = 'app.urls' -WSGI_APPLICATION = 'myapp.wsgi.application' +WSGI_APPLICATION = 'app.wsgi.application' # Database diff --git a/example_project/myapp/templates/base.html b/example/app/templates/base.html similarity index 100% rename from example_project/myapp/templates/base.html rename to example/app/templates/base.html diff --git a/example_project/myapp/templates/home.html b/example/app/templates/home.html similarity index 95% rename from example_project/myapp/templates/home.html rename to example/app/templates/home.html index c2f2518..32e01ff 100644 --- a/example_project/myapp/templates/home.html +++ b/example/app/templates/home.html @@ -3,7 +3,7 @@ {% block content %} -
+

{% trans 'Welcome' %}{% if user.is_authenticated %} {{ user.username }}{% endif %}!

{% trans 'This is an example of an OpenID Connect 1.0 Provider. Built with the Django Framework and django-oidc-provider package.' %}

diff --git a/example_project/myapp/templates/login.html b/example/app/templates/login.html similarity index 100% rename from example_project/myapp/templates/login.html rename to example/app/templates/login.html diff --git a/example_project/myapp/templates/oidc_provider/authorize.html b/example/app/templates/oidc_provider/authorize.html similarity index 100% rename from example_project/myapp/templates/oidc_provider/authorize.html rename to example/app/templates/oidc_provider/authorize.html diff --git a/example_project/myapp/templates/oidc_provider/error.html b/example/app/templates/oidc_provider/error.html similarity index 100% rename from example_project/myapp/templates/oidc_provider/error.html rename to example/app/templates/oidc_provider/error.html diff --git a/example_project/myapp/urls.py b/example/app/urls.py similarity index 100% rename from example_project/myapp/urls.py rename to example/app/urls.py diff --git a/example_project/myapp/wsgi.py b/example/app/wsgi.py similarity index 60% rename from example_project/myapp/wsgi.py rename to example/app/wsgi.py index dd74e93..7c75d28 100644 --- a/example_project/myapp/wsgi.py +++ b/example/app/wsgi.py @@ -1,6 +1,8 @@ import os + from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myapp.settings') + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') application = get_wsgi_application() diff --git a/example_project/manage.py b/example/manage.py similarity index 71% rename from example_project/manage.py rename to example/manage.py index 7bf6f3d..7adfe49 100755 --- a/example_project/manage.py +++ b/example/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myapp.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') from django.core.management import execute_from_command_line diff --git a/example/requirements.txt b/example/requirements.txt new file mode 100644 index 0000000..4f95392 --- /dev/null +++ b/example/requirements.txt @@ -0,0 +1,2 @@ +django +https://github.com/juanifioren/django-oidc-provider/archive/master.zip diff --git a/example_project/requirements.txt b/example_project/requirements.txt deleted file mode 100644 index 412a8f5..0000000 --- a/example_project/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -django==1.10 -https://github.com/juanifioren/django-oidc-provider/archive/v0.4.x.zip