Skip to content
Snippets Groups Projects
Verified Commit 4ca9335a authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Refactor OAuth2 application management views

parent 28c1c1ac
No related branches found
No related tags found
1 merge request!761Resolve "[OAuth2] Views for managing applications are totally broken"
Hide whitespace changes
Inline Side-by-side
Showing
with 110 additions and 138 deletions
aleksis/core/menus.py
+ 1
− 1
View file @ 4ca9335a
......@@ -214,7 +214,7 @@ MENUS = {
},
{
"name": _("OAuth2 Applications"),
"url": "oauth_list",
"url": "oauth2_applications",
"icon": "touch_app",
"validators": [
(
......
aleksis/core/models.py
+ 0
− 5
View file @ 4ca9335a
......@@ -982,11 +982,6 @@ class GlobalPermissions(GlobalPermissionModel):
("change_site_preferences", _("Can change site preferences")),
("change_person_preferences", _("Can change person preferences")),
("change_group_preferences", _("Can change group preferences")),
("add_oauth_applications", _("Can add oauth applications")),
("list_oauth_applications", _("Can list oauth applications")),
("view_oauth_applications", _("Can view oauth applications")),
("update_oauth_applications", _("Can update oauth applications")),
("delete_oauth_applications", _("Can delete oauth applications")),
("test_pdf", _("Can test PDF generation")),
)
......
aleksis/core/rules.py
+ 8
− 8
View file @ 4ca9335a
......@@ -319,17 +319,17 @@ can_change_password_predicate = is_site_preference_set(section="auth", pref="all
rules.add_perm("core.can_change_password", can_change_password_predicate)
# OAuth2 permissions
add_oauth_applications_predicate = has_person & has_global_perm("core.add_oauth_applications")
rules.add_perm("core.add_oauth_applications_rule", add_oauth_applications_predicate)
create_oauthapplication_predicate = has_person & has_global_perm("core.add_oauthapplication")
rules.add_perm("core.create_oauthapplication_rule", create_oauthapplication_predicate)
list_oauth_applications_predicate = has_person & has_global_perm("core.list_oauth_applications")
rules.add_perm("core.list_oauth_applications_rule", list_oauth_applications_predicate)
view_oauth_applications_predicate = has_person & has_global_perm("core.view_oauthapplication")
rules.add_perm("core.view_oauthapplications_rule", view_oauth_applications_predicate)
view_oauth_applications_predicate = has_person & has_global_perm("core.view_oauth_applications")
rules.add_perm("core.view_oauth_applications_rule", view_oauth_applications_predicate)
view_oauth_application_predicate = has_person & has_global_perm("core.view_oauthapplication")
rules.add_perm("core.view_oauthapplication_rule", view_oauth_application_predicate)
update_oauth_applications_predicate = has_person & has_global_perm("core.update_oauth_applications")
rules.add_perm("core.update_oauth_applications_rule", update_oauth_applications_predicate)
edit_oauth_application_predicate = has_person & has_global_perm("core.change_oauthapplication")
rules.add_perm("core.edit_oauthapplication_rule", edit_oauth_application_predicate)
delete_oauth_applications_predicate = has_person & has_global_perm("core.delete_oauth_applications")
rules.add_perm("core.delete_oauth_applications_rule", delete_oauth_applications_predicate)
......
aleksis/core/templates/oauth2_provider/application/create.html
+ 1
− 1
View file @ 4ca9335a
......@@ -10,7 +10,7 @@
{% csrf_token %}
{% form form=form %}{% endform %}
{% include "core/partials/save_button.html" %}
<a class="btn waves-effect red waves-light" href="{% url "oauth_list" %}">
<a class="btn waves-effect red waves-light" href="{% url "oauth2_applications" %}">
<i class="material-icons left">clear</i> {% trans "Cancel" %}
</a>
</form>
......
aleksis/core/templates/oauth2_provider/application/detail.html 0 → 100644
+ 59
− 0
View file @ 4ca9335a
{% extends "core/base.html" %}
{% load i18n %}
{% block browser_title %}{% blocktrans %}OAuth2 Application{% endblocktrans %}{% endblock %}
{% block page_title %}
<a href="{% url "oauth2_applications" %}"
class="btn-flat primary-color-text waves-light waves-effect">
<i class="material-icons left">chevron_left</i> {% trans "Back" %}
</a>
{{ application.name }}
{% endblock %}
{% block content %}
<a class="btn orange waves-effect waves-light btn-margin" href="{% url "edit_oauth2_application" application.id %}">
<i class="material-icons left">edit</i>
{% trans "Edit" %}
</a>
<a class="btn red waves-effect waves-light btn-margin" href="{% url "delete_oauth2_application" application.id %}">
<i class="material-icons left">delete</i>
{% trans "Delete" %}
</a>
<table class="responsive-table">
<tbody>
<tr>
<th>
{% trans "Client id" %}
</th>
<td>
<code class="break-word">{{ application.client_id }}</code>
</td>
</tr>
<tr>
<th>
{% trans "Client secret" %}
</th>
<td>
<code class="break-word">{{ application.client_secret }}</code>
</td>
</tr>
<tr>
<th>
{% trans "Client type" %}
</th>
<td>
{{ application.client_type }}
</td>
</tr>
<tr>
<th>
{% trans "Redirect URIs" %}
</th>
<td>
{{ application.redirect_uris }}
</td>
</tr>
</tbody>
</table>
{% endblock %}
aleksis/core/templates/oauth2_provider/application/edit.html
+ 1
− 1
View file @ 4ca9335a
......@@ -10,7 +10,7 @@
{% csrf_token %}
{% form form=form %}{% endform %}
{% include "core/partials/save_button.html" %}
<a class="btn waves-effect red waves-light" href="{% url "oauth_detail" application.id %}">
<a class="btn waves-effect red waves-light" href="{% url "oauth2_application" application.id %}">
<i class="material-icons left">clear</i> {% trans "Cancel" %}
</a>
</form>
......
aleksis/core/templates/oauth2_provider/application_list.html → aleksis/core/templates/oauth2_provider/application/list.html
+ 11
− 13
View file @ 4ca9335a
......@@ -3,24 +3,22 @@
{% load i18n %}
{% block browser_title %}{% blocktrans %}OAuth2 Applications{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}OAuth2 Applications{% endblocktrans %}{% endblock %}
{% block content %}
<h1>{% blocktrans %}OAuth2 applications{% endblocktrans %}</h1>
<a href="{% url "register_oauth_application" %}" class="btn green waves-effect waves-light">
<i class="material-icons left">add</i>
{% blocktrans %}Register new application{% endblocktrans %}
</a>
<ul class="collection">
{% for application in applications %}
<li class="collection-item">
<div>
<a href="{% url "oauth_detail" application.id %}">{{ application.name }}</a>
</div>
</li>
{% empty %}
<li class="collection-item flow-text">
<div class="collection">
{% for application in applications %}
<a class="collection-item" href="{% url "oauth2_application" application.id %}">
{{ application.name }}
</a>
{% empty %}
<div class="collection-item flow-text">
{% blocktrans %}No applications defined.{% endblocktrans %}
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</div>
{% endblock %}
aleksis/core/templates/oauth2_provider/application_confirm_delete.html deleted 100644 → 0
+ 0
− 27
View file @ 28c1c1ac
{% extends "core/base.html" %}
{% load i18n %}
{% block browser_title %}{% trans "Delete application" %}{% endblock %}
{% block page_title %}{% trans "Delete application" %}{% endblock %}
{% block content %}
<div class="alert info">
<p>
<i class="material-icons left">warning</i>
{% blocktrans with application_name=application.name %}Are you sure to delete the application {{ application_name }}?{% endblocktrans %}
</p>
</div>
<form method="post" action="{% url 'oauth2_provider:delete' application.pk %}">
{% csrf_token %}
<button type="submit" class="btn waves-effect waves-light red">
<i class="material-icons left">delete</i>
{% trans "Delete" %}
</button>
<a class="btn waves-effect waves-light" href="{% url "oauth2_provider:list" %}">
<i class="material-icons left">close</i>
{% trans "Cancel" %}
</a>
</form>
{% endblock %}
aleksis/core/templates/oauth2_provider/application_detail.html deleted 100644 → 0
+ 0
− 59
View file @ 28c1c1ac
{% extends "core/base.html" %}
{% load i18n %}
{% block browser_title %}{% blocktrans %}OAuth2 Applications{% endblocktrans %}{% endblock %}
{% block page_title %}
<a href="{% url "oauth_list" %}"
class="btn-flat primary-color-text waves-light waves-effect">
<i class="material-icons left">chevron_left</i> {% trans "Back" %}
</a>
{{ application.name }}
{% endblock %}
{% block content %}
<a class="btn waves-effect waves-light btn-margin" href="{% url "edit_oauth_application" application.id %}">
<i class="material-icons left">edit</i>
{% trans "Edit" %}
</a>
<a class="btn red waves-effect waves-light btn-margin" href="{% url "oauth_delete" application.id %}">
<i class="material-icons left">delete_forever</i>
{% trans "Delete" %}
</a>
<table class="responsive-table">
<tbody>
<tr>
<th>
{% trans "Client id" %}
</td>
<td>
<code class="break-word">{{ application.client_id }}</code>
</td>
</tr>
<tr>
<th>
{% trans "Client secret"%}
</td>
<td>
<code class="break-word">{{ application.client_secret }}</code>
</td>
</tr>
<tr>
<th>
{% trans "Client type"%}
</td>
<td>
{{ application.client_type }}
</td>
</tr>
<tr>
<th>
{% trans "Redirect URIs"%}
</td>
<td>
{{ application.redirect_uris }}
</td>
</tr>
</tbody>
</table>
{% endblock %}
aleksis/core/templates/oauth2_provider/authorize.html
+ 1
− 1
View file @ 4ca9335a
......@@ -32,7 +32,7 @@
<button type="submit" class="btn green waves-effect waves-light btn-margin">
<i class="material-icons left">done_all</i> {% trans "Allow" %}
</button>
<a class="btn red waves-effect waves-light btn-margin" href="{% block app-form-back-url %}{% url "oauth_detail" application.id %}{% endblock app-form-back-url %}">
<a class="btn red waves-effect waves-light btn-margin" href="{% block app-form-back-url %}{% url "oauth2_application" application.id %}{% endblock app-form-back-url %}">
<i class="material-icons left">cancel</i> {% trans "Disallow" %}
</a>
</form>
......
aleksis/core/templates/oauth2_provider/authorized-token-delete.html
+ 2
− 2
View file @ 4ca9335a
......@@ -15,11 +15,11 @@
<form method="post">
{% csrf_token %}
<a class="btn waves-effect waves-light red" href="{% url "oauth_list" %}">
<a class="btn waves-effect waves-light red" href="{% url "oauth2_applications" %}">
<i class="material-icons left">delete</i>
{% trans "Revoke" %}
</a>
<a class="btn waves-effect waves-light" href="{% url "oauth_list" %}">
<a class="btn waves-effect waves-light" href="{% url "oauth2_applications" %}">
<i class="material-icons left">cancel</i>
{% trans "Cancel" %}
</a>
......
aleksis/core/urls.py
+ 13
− 7
View file @ 4ca9335a
......@@ -102,20 +102,26 @@ urlpatterns = [
ConnectDiscoveryInfoView.as_view(),
name="oidc_configuration",
),
path("oauth/applications/", views.OAuth2List.as_view(), name="oauth_list"),
path("oauth2/applications/", views.OAuth2ListView.as_view(), name="oauth2_applications"),
path(
"oauth/applications/register/",
"oauth2/applications/register/",
views.OAuth2RegisterView.as_view(),
name="register_oauth_application",
),
path("oauth/applications/<int:pk>/detail", views.OAuth2Detail.as_view(), name="oauth_detail"),
path("oauth/applications/<int:pk>/delete", views.OAuth2Delete.as_view(), name="oauth_delete"),
path(
"oauth/applications/<int:pk>/edit/",
"oauth2/applications/<int:pk>/", views.OAuth2DetailView.as_view(), name="oauth2_application"
),
path(
"oauth2/applications/<int:pk>/delete/",
views.OAuth2DeleteView.as_view(),
name="delete_oauth2_application",
),
path(
"oauth2/applications/<int:pk>/edit/",
views.OAuth2EditView.as_view(),
name="edit_oauth_application",
name="edit_oauth2_application",
),
path("oauth/", include("oauth2_provider.urls", namespace="oauth2_provider")),
path("oauth2/", include("oauth2_provider.urls", namespace="oauth2_provider")),
path("__i18n__/", include("django.conf.urls.i18n")),
path(
"ckeditor/upload/",
......
aleksis/core/views.py
+ 13
− 13
View file @ 4ca9335a
......@@ -1033,44 +1033,44 @@ class EditDashboardView(PermissionRequiredMixin, View):
return render(request, "core/edit_dashboard.html", context=context)
class OAuth2List(PermissionRequiredMixin, ListView):
class OAuth2ListView(PermissionRequiredMixin, ListView):
"""List view for all the applications."""
permission_required = "core.list_oauth_applications_rule"
permission_required = "core.view_oauthapplications_rule"
context_object_name = "applications"
template_name = "oauth2_provider/application_list.html"
template_name = "oauth2_provider/application/list.html"
def get_queryset(self):
return OAuthApplication.objects.all()
class OAuth2Detail(PermissionRequiredMixin, DetailView):
class OAuth2DetailView(PermissionRequiredMixin, DetailView):
"""Detail view for an application instance."""
context_object_name = "application"
permission_required = "core.view_oauth_applications_rule"
template_name = "oauth2_provider/application_detail.html"
permission_required = "core.view_oauthapplication_rule"
template_name = "oauth2_provider/application/detail.html"
def get_queryset(self):
return OAuthApplication.objects.all()
class OAuth2Delete(PermissionRequiredMixin, DeleteView):
class OAuth2DeleteView(PermissionRequiredMixin, AdvancedDeleteView):
"""View used to delete an application."""
permission_required = "core.delete_oauth_applications_rule"
permission_required = "core.delete_oauthapplication_rule"
context_object_name = "application"
success_url = reverse_lazy("oauth_list")
template_name = "oauth2_provider/application_confirm_delete.html"
success_url = reverse_lazy("oauth2_applications")
template_name = "core/pages/delete.html"
def get_queryset(self):
return OAuthApplication.objects.all()
class OAuth2EditView(PermissionRequiredMixin, AdvancedEditView):
"""View used to update an application."""
"""View used to edit an application."""
permission_required = "core.update_oauth_applications_rule"
permission_required = "core.edit_oauthapplication_rule"
context_object_name = "application"
template_name = "oauth2_provider/application/edit.html"
form_class = OAuthApplicationForm
......@@ -1082,7 +1082,7 @@ class OAuth2EditView(PermissionRequiredMixin, AdvancedEditView):
class OAuth2RegisterView(PermissionRequiredMixin, AdvancedCreateView):
"""View used to register an application."""
permission_required = "core.add_oauth_applications_rule"
permission_required = "core.create_oauthapplication_rule"
context_object_name = "application"
template_name = "oauth2_provider/application/create.html"
form_class = OAuthApplicationForm
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment