From 6efb75ae84452819ff561ab923153838c17317e9 Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Tue, 6 Oct 2026 13:05:56 -0500 Subject: [PATCH] adds a section to list users' api keys --- ohmg/accounts/models.py | 7 +++- ohmg/accounts/urls.py | 3 +- ohmg/accounts/views.py | 15 ++++++++ ohmg/frontend/static/css/site_base.css | 22 ++++++++++- ohmg/frontend/templates/_navbar.html | 7 +++- .../frontend/templates/accounts/api-keys.html | 38 +++++++++++++++++++ .../templates/allauth/layouts/base.html | 15 +++++--- 7 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 ohmg/frontend/templates/accounts/api-keys.html diff --git a/ohmg/accounts/models.py b/ohmg/accounts/models.py index afd0a488..0ba61356 100644 --- a/ohmg/accounts/models.py +++ b/ohmg/accounts/models.py @@ -30,7 +30,12 @@ def profile_url(self): @cached_property def api_keys(self): - return [i for i in APIKey.objects.filter(account=self).values_list("value", flat=True)] + return [ + i + for i in APIKey.objects.filter(account=self).values_list( + "value", "active", "request_count" + ) + ] def update_sesh_counts(self): self.load_ct = Map.objects.filter(loaded_by=self).count() diff --git a/ohmg/accounts/urls.py b/ohmg/accounts/urls.py index 495935fe..718fb25e 100644 --- a/ohmg/accounts/urls.py +++ b/ohmg/accounts/urls.py @@ -1,10 +1,11 @@ from django.urls import include, path -from .views import OHMGSignupView, ProfilesView, ProfileView +from .views import APIKeysView, OHMGSignupView, ProfilesView, ProfileView urlpatterns = [ ## overwrite the default allauth signup view here path("account/signup/", OHMGSignupView.as_view(), name="account_signup"), + path("account/api-keys/", APIKeysView.as_view(), name="api_keys"), path("account/", include("allauth.urls")), path("profile//", ProfileView.as_view(), name="profile_detail"), path("profiles/", ProfilesView.as_view(), name="profiles"), diff --git a/ohmg/accounts/views.py b/ohmg/accounts/views.py index 8bf1d186..03fb17d7 100644 --- a/ohmg/accounts/views.py +++ b/ohmg/accounts/views.py @@ -64,3 +64,18 @@ def form_valid(self, form): if not verify_prosopo_token(token): raise ValidationError("Invalid token", code="invalid") return super(self.__class__, self).form_valid(form) + + +class APIKeysView(View): + def get(self, request): + ohmg_context = generate_ohmg_context(request) + return render( + request, + "accounts/api-keys.html", + context={ + "CONTEXT": ohmg_context, + "PROFILES_PROPS": { + "CONTEXT": ohmg_context, + }, + }, + ) diff --git a/ohmg/frontend/static/css/site_base.css b/ohmg/frontend/static/css/site_base.css index cfe52e5e..64171b35 100644 --- a/ohmg/frontend/static/css/site_base.css +++ b/ohmg/frontend/static/css/site_base.css @@ -52,8 +52,26 @@ img { } table { - border-spacing: 0; - width: 100%; + min-width: 100%; + border: 1px solid #ddd; +} + +table caption { + color: #333; + text-align: center; +} + +th, +td { + padding: 4px; +} + +tr:nth-child(even) { + background-color: #f6f6f6; +} + +tr:nth-child(odd) { + background-color: #ffffff; } pre { diff --git a/ohmg/frontend/templates/_navbar.html b/ohmg/frontend/templates/_navbar.html index 5a51afeb..c15bf3d7 100644 --- a/ohmg/frontend/templates/_navbar.html +++ b/ohmg/frontend/templates/_navbar.html @@ -44,14 +44,17 @@
{% if user.is_authenticated %} -
+
-
+
My profile My account + {% if user.is_staff %} + Admin backend + {% endif %} Sign out
diff --git a/ohmg/frontend/templates/accounts/api-keys.html b/ohmg/frontend/templates/accounts/api-keys.html new file mode 100644 index 00000000..0fb009ae --- /dev/null +++ b/ohmg/frontend/templates/accounts/api-keys.html @@ -0,0 +1,38 @@ +{% extends "account/base_manage.html" %} +{% load allauth i18n %} +{% block content %} +
Our API is still in beta mode and should not be considered stable.
+
+

+ {% trans "API access" %} +

+

To request a new key, email: hello@oldinsurancemaps.net.

+

Include the key in an X-API-Key header of each request. See the API docs for endpoints:

+ +

Please wait at least 2 seconds between requests, for example when working through paginated response lists.

+

Currently, GeoTIFF downloads do not require an API key (they come straight from S3 compatible storage buckets) + and are not limited. Be aware this may change in the future.

+
+ {% if CONTEXT.user.api_keys|length > 0 %} + + + + + + + + + + {% for key in CONTEXT.user.api_keys %} + + + + + + {% endfor %} + +
KeyActive?Usage
{{key.0}}{% if key.1 %}✓{% else %}x{% endif %}{{key.2}}
+ {% endif %} +{% endblock %} \ No newline at end of file diff --git a/ohmg/frontend/templates/allauth/layouts/base.html b/ohmg/frontend/templates/allauth/layouts/base.html index a172782b..9327a7f4 100644 --- a/ohmg/frontend/templates/allauth/layouts/base.html +++ b/ohmg/frontend/templates/allauth/layouts/base.html @@ -13,28 +13,28 @@ {% url 'account_email' as email_url_ %} {% if email_url_ %} {% endif %} {% url 'account_change_password' as change_password_url_ %} {% if change_password_url_ %}
  • - {% trans "Change Password" %} + {% trans "Change password" %}
    • {% endif %}
  • - {% trans "Change Avatar" %} + {% trans "Change avatar" %}
    • {% url 'socialaccount_connections' as connections_url_ %} {% if connections_url_ %}
  • - {% trans "Account Connections" %} + {% trans "Account connections" %}
    • {% endif %} {% url 'mfa_index' as mfa_url_ %} {% if mfa_url_ %}
  • - {% trans "Two-Factor Authentication" %} + {% trans "Two-factor authentication" %}
    • {% endif %} {% url 'usersessions_list' as usersessions_list_url_ %} @@ -46,9 +46,12 @@ {% url 'account_logout' as logout_url_ %} {% if logout_url_ %}
  • - {% trans "Sign Out" %} + {% trans "Sign out" %}
    • {% endif %} +
  • + {% trans "API access" %} +
    • {% else %} {% url 'account_login' as login_url_ %} {% if login_url_ %}