From 4602905314162909e25b2ff004570aa9b74d8898 Mon Sep 17 00:00:00 2001 From: juanifioren Date: Thu, 15 Jan 2015 16:29:19 -0300 Subject: [PATCH] Delete client creation stuff. (should not be in the package) --- README.rst | 4 +- .../templates/openid_provider/authorize.html | 2 +- .../templates/openid_provider/base.html | 70 ------------------- .../openid_provider/client_create.html | 50 ------------- .../openid_provider/client_detail.html | 47 ------------- .../openid_provider/client_list.html | 40 ----------- .../templates/openid_provider/error.html | 2 +- .../templates/openid_provider/login.html | 40 ----------- .../templates/openid_provider/logout.html | 19 ----- openid_provider/urls.py | 16 ++--- .../{views/endpoints.py => views.py} | 0 openid_provider/views/__init__.py | 0 openid_provider/views/clients.py | 59 ---------------- 13 files changed, 7 insertions(+), 342 deletions(-) delete mode 100644 openid_provider/templates/openid_provider/base.html delete mode 100644 openid_provider/templates/openid_provider/client_create.html delete mode 100644 openid_provider/templates/openid_provider/client_detail.html delete mode 100644 openid_provider/templates/openid_provider/client_list.html delete mode 100644 openid_provider/templates/openid_provider/login.html delete mode 100644 openid_provider/templates/openid_provider/logout.html rename openid_provider/{views/endpoints.py => views.py} (100%) delete mode 100644 openid_provider/views/__init__.py delete mode 100644 openid_provider/views/clients.py diff --git a/README.rst b/README.rst index e4099bc..7707fa6 100644 --- a/README.rst +++ b/README.rst @@ -61,9 +61,7 @@ Then let's create a Client. Start django shell: ``python manage.py shell``. .. code:: python >>> from openid_provider.models import Client - >>> c = Client(name='Some Client', client_id='123', client_secret='456', client_type='public', response_type='code', redirect_uris=['http://example.com/']) - >>> from django.contrib.auth.models import User - >>> c.user = User.objects.all()[0] + >>> c = Client(name='Some Client', client_id='123', client_secret='456', client_type='confidential', response_type='code', redirect_uris=['http://example.com/']) >>> c.save() ******************* diff --git a/openid_provider/templates/openid_provider/authorize.html b/openid_provider/templates/openid_provider/authorize.html index a6f3363..e09b494 100644 --- a/openid_provider/templates/openid_provider/authorize.html +++ b/openid_provider/templates/openid_provider/authorize.html @@ -1,4 +1,4 @@ -{% extends "openid_provider/base.html" %} +{% extends "base.html" %} {% load i18n %} diff --git a/openid_provider/templates/openid_provider/base.html b/openid_provider/templates/openid_provider/base.html deleted file mode 100644 index 3c92587..0000000 --- a/openid_provider/templates/openid_provider/base.html +++ /dev/null @@ -1,70 +0,0 @@ -{% load staticfiles %} - - - - - - OpenID Provider - - - - - - - - - - - - -
- {% block content %}{% endblock %} -
- - - - - - \ No newline at end of file diff --git a/openid_provider/templates/openid_provider/client_create.html b/openid_provider/templates/openid_provider/client_create.html deleted file mode 100644 index 867a114..0000000 --- a/openid_provider/templates/openid_provider/client_create.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "openid_provider/base.html" %} - -{% load i18n %} - -{% block content %} - -
-
-
-
-

Create new client

-
-
- {% if error %} - - {% endif %} -
- {% csrf_token %} -
- - -
-
- - -
-
- - -
-
- - -
- -
Go Back -
-
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/openid_provider/templates/openid_provider/client_detail.html b/openid_provider/templates/openid_provider/client_detail.html deleted file mode 100644 index b910043..0000000 --- a/openid_provider/templates/openid_provider/client_detail.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends "openid_provider/base.html" %} - -{% load i18n %} - -{% block content %} - -
-
-
-
-

{{ object.name }}

-
-
-

ID

-
{{ object.client_id }}
-

SECRET

-
{{ object.client_secret }}
- - - - - - - - - - - - - - - - - - -
User{{ object.user.email }}
Client Type{{ object.client_type }}
Response Type{{ object.response_type }}
Redirect URIs{{ object.redirect_uris|join:', ' }}
-
- Delete - Edit -
-
Go Back -
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/openid_provider/templates/openid_provider/client_list.html b/openid_provider/templates/openid_provider/client_list.html deleted file mode 100644 index 44d43aa..0000000 --- a/openid_provider/templates/openid_provider/client_list.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "openid_provider/base.html" %} - -{% load i18n %} - -{% block content %} - -
-
-
-
-
    -
  • - {{ object_list.count }} - Total -
    • -
- New Client -
-
-
-
-
-
-

Clients

-
-
-

{% trans 'Click on the client you want to see.' %}

-
- {% for client in object_list %} - {{ client.name }}{{ client.default_redirect_uri }} - {% empty %} -
No clients yet.
- {% endfor %} -
-
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/openid_provider/templates/openid_provider/error.html b/openid_provider/templates/openid_provider/error.html index b5288eb..b682789 100644 --- a/openid_provider/templates/openid_provider/error.html +++ b/openid_provider/templates/openid_provider/error.html @@ -1,4 +1,4 @@ -{% extends "openid_provider/base.html" %} +{% extends "base.html" %} {% load i18n %} diff --git a/openid_provider/templates/openid_provider/login.html b/openid_provider/templates/openid_provider/login.html deleted file mode 100644 index 72e9d8d..0000000 --- a/openid_provider/templates/openid_provider/login.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "openid_provider/base.html" %} - -{% load i18n %} - -{% block content %} - -
-
-
-
-

Please sign in

-
- {% if form.errors %} - - {% endif %} -
- {% csrf_token %} -
-
- -
-
- -
-
- -
- - - -
-
-
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/openid_provider/templates/openid_provider/logout.html b/openid_provider/templates/openid_provider/logout.html deleted file mode 100644 index 4201674..0000000 --- a/openid_provider/templates/openid_provider/logout.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "openid_provider/base.html" %} - -{% load i18n %} - -{% block content %} - -
-
-
-
-

{{ title }}

-

{% trans "Thanks for spending some quality time with the Web site today." %}

-

{% trans 'Log in again' %}

-
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/openid_provider/urls.py b/openid_provider/urls.py index 4a82c21..c937e23 100644 --- a/openid_provider/urls.py +++ b/openid_provider/urls.py @@ -1,20 +1,12 @@ from django.conf.urls import patterns, include, url from django.views.decorators.csrf import csrf_exempt +from openid_provider.views import * -from openid_provider.views import clients -from openid_provider.views import endpoints urlpatterns = patterns('', - url(r'^authorize/$', endpoints.AuthorizeView.as_view(), name='authorize'), - url(r'^token/$', csrf_exempt(endpoints.TokenView.as_view()), name='token'), - url(r'^userinfo/$', csrf_exempt(endpoints.userinfo), name='userinfo'), - - url(r'^login/$', 'django.contrib.auth.views.login', { 'template_name': 'openid_provider/login.html' }, name='login'), - url(r'^logout/$', 'django.contrib.auth.views.logout', { 'template_name': 'openid_provider/logout.html' }, name='logout'), - - url(r'^clients/$', clients.ClientListView.as_view(), name='client_list'), - url(r'^clients/(?P[\d]+)/$', clients.ClientDetailView.as_view(), name='client_detail'), - url(r'^clients/create/$', clients.client_create, name='client_create'), + url(r'^authorize/$', AuthorizeView.as_view(), name='authorize'), + url(r'^token/$', csrf_exempt(TokenView.as_view()), name='token'), + url(r'^userinfo/$', csrf_exempt(userinfo), name='userinfo'), ) \ No newline at end of file diff --git a/openid_provider/views/endpoints.py b/openid_provider/views.py similarity index 100% rename from openid_provider/views/endpoints.py rename to openid_provider/views.py diff --git a/openid_provider/views/__init__.py b/openid_provider/views/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/openid_provider/views/clients.py b/openid_provider/views/clients.py deleted file mode 100644 index afebaa8..0000000 --- a/openid_provider/views/clients.py +++ /dev/null @@ -1,59 +0,0 @@ -from django.shortcuts import redirect -from django.shortcuts import render -from django.utils.decorators import method_decorator -from django.views.generic.detail import DetailView -from django.views.generic.edit import CreateView -from django.views.generic.list import ListView -from openid_provider.lib.utils.decorators import staff_required -from openid_provider.models import Client -from random import random -import uuid - - -class ClientListView(ListView): - - model = Client - - @method_decorator(staff_required) - def dispatch(self, *args, **kwargs): - return super(ClientListView, self).dispatch(*args, **kwargs) - -class ClientDetailView(DetailView): - - model = Client - - @method_decorator(staff_required) - def dispatch(self, *args, **kwargs): - return super(ClientListView, self).dispatch(*args, **kwargs) - -@staff_required -def client_create(request): - - error = False - - if request.method == 'POST': - - try: - client = Client() - - client.name = request.POST.get('name') - client.client_type = request.POST.get('client_type') - client.response_type = request.POST.get('response_type') - client.redirect_uris = request.POST.get('redirect_uris') - - client.client_id = str(random()).split('.')[1][:8] - client.client_secret = uuid.uuid4().hex - - client.save() - - return redirect('openid_provider:client_list') - - except Exception as e: - print e - error = True - - data = { - 'error': error, - } - - return render(request, 'openid_provider/client_create.html', data) \ No newline at end of file