From 53d3a59c6f07f586a07438957869d834f36c4d11 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Fri, 30 Jun 2023 11:44:04 +0300 Subject: Edit some of the details of OAuth2 clients --- gn3/auth/authorisation/users/admin/views.py | 43 +++++++++++++++- gn3/templates/admin/list-oauth2-clients.html | 4 +- gn3/templates/admin/view-oauth2-client.html | 75 ++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 gn3/templates/admin/view-oauth2-client.html diff --git a/gn3/auth/authorisation/users/admin/views.py b/gn3/auth/authorisation/users/admin/views.py index 11152d2..c199b9f 100644 --- a/gn3/auth/authorisation/users/admin/views.py +++ b/gn3/auth/authorisation/users/admin/views.py @@ -24,7 +24,8 @@ from gn3.auth.db_utils import with_db_connection from gn3.auth.authentication.oauth2.models.oauth2client import ( save_client, OAuth2Client, - oauth2_clients) + oauth2_clients, + client as oauth2_client) from gn3.auth.authentication.users import ( User, user_by_id, @@ -169,3 +170,43 @@ def list_clients(): return render_template( "admin/list-oauth2-clients.html", clients=with_db_connection(oauth2_clients)) + +@admin.route("/view-client/", methods=["GET"]) +@is_admin +def view_client(client_id: uuid.UUID): + """View details of OAuth2 client with given `client_id`.""" + return render_template( + "admin/view-oauth2-client.html", + client=with_db_connection(partial(oauth2_client, client_id=client_id)), + scope=current_app.config["OAUTH2_SCOPE"]) + +@admin.route("/edit-client", methods=["POST"]) +@is_admin +def edit_client(): + """Edit the details of the given client.""" + form = request.form + the_client = with_db_connection(partial( + oauth2_client, client_id=uuid.UUID(form["client_id"]))) + if the_client.is_nothing(): + flash("No such client.", "alert-error") + return redirect(url_for("oauth2.admin.list_clients")) + the_client = the_client.value + client_metadata = { + **the_client.client_metadata, + "default_redirect_uri": form["default_redirect_uri"], + "redirect_uris": list(set( + [form["default_redirect_uri"]] + + form["other_redirect_uris"].split("\r\n"))), + "grants": form.getlist("grants[]"), + "scope": form.getlist("scope[]") + } + with_db_connection(partial(save_client, the_client=OAuth2Client( + the_client.client_id, + the_client.client_secret, + the_client.client_id_issued_at, + the_client.client_secret_expires_at, + client_metadata, + the_client.user))) + flash("Client updated.", "alert-success") + return redirect(url_for("oauth2.admin.view_client", + client_id=the_client.client_id)) diff --git a/gn3/templates/admin/list-oauth2-clients.html b/gn3/templates/admin/list-oauth2-clients.html index f6bbcb2..02f73d4 100644 --- a/gn3/templates/admin/list-oauth2-clients.html +++ b/gn3/templates/admin/list-oauth2-clients.html @@ -8,7 +8,7 @@

Genenetwork3: OAuth2 Clients

- List of registered OAuth2 clients + @@ -27,7 +27,7 @@
List of registered OAuth2 clients
Client ID{{client.client_metadata.default_redirect_uri}} {{client.user.name}} ({{client.user.email}}) - View/Edit diff --git a/gn3/templates/admin/view-oauth2-client.html b/gn3/templates/admin/view-oauth2-client.html new file mode 100644 index 0000000..d5d4b2b --- /dev/null +++ b/gn3/templates/admin/view-oauth2-client.html @@ -0,0 +1,75 @@ +{%extends "base.html"%} + +{%block title%}Genenetwork3: View OAuth2 Client{%endblock%} + +{%block content%} +{{flash_messages()}} + +

Genenetwork3: View OAuth2 Client

+ +{%if client.is_nothing()%} +

No such client

+{%else%} +{%set client = client.value%} +
+ View/Edit Oauth2 Client + +
+

Client ID: {{client.client_id}}

+

Client Name: {{client.client_metadata.client_name}}

+
+
+ Scope + {%for scp in scope%} + +
+ {%endfor%} +
+ +
+ Redirect URIs + +
+ +

+ + +
+ +
+ +
+ Grants + + +

+ + + +
+ + + +{%endif%} +{%endblock%} -- cgit v1.2.3