add migration for django-oauth-toolkit update, alter templates, pin version

Author: jeriox

ephios/api/migrations/0004_application_allowed_origins_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.0.6 on 2024-07-02 21:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0003_application_post_logout_redirect_uris"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="application",
+            name="allowed_origins",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="Allowed origins list to enable CORS, space separated",
+            ),
+        ),
+        migrations.AddField(
+            model_name="application",
+            name="hash_client_secret",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name="accesstoken",
+            name="token",
+            field=models.CharField(db_index=True, max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="application",
+            name="post_logout_redirect_uris",
+            field=models.TextField(
+                blank=True, default="", help_text="Allowed Post Logout URIs list, space separated"
+            ),
+        ),
+    ]

ephios/api/templates/oauth2_provider/application_detail.html

@@ -16,16 +16,25 @@ <h3 class="block-center-heading">{{ application.name }}</h3>
 
             </div>
         </div>
-        <div class="mb-3">
-            <label for="client_secret" class="form-label">{% translate "Client secret" %}</label>
-            <div class="input-group">
-                <input id="client_secret" class="form-control" type="text" value="{{ application.client_secret }}"
+        {% if application.hash_client_secret %}
+            <div class="mb-3">
+                <label for="client_secret" class="form-label">{% translate "Client secret" %}</label>
+                <input id="client_secret" class="form-control" type="text" value="********"
                        readonly>
-                <button id="client_secret-copy-btn" class="btn btn-outline-secondary clipboard-button" type="button"
-                        data-clipboard-target="#client_secret" data-trigger="manual"
-                        title="Copied!">{% translate "Copy" %}</button>
+                <div class="form-text">{% translate "The client secret can not be shown again. Please edit the application and set a new secret if necessary." %}</div>
             </div>
-        </div>
+        {% else %}
+            <div class="mb-3">
+                <label for="client_secret" class="form-label">{% translate "Client secret" %}</label>
+                <div class="input-group">
+                    <input id="client_secret" class="form-control" type="text" value="{{ application.client_secret }}"
+                           readonly>
+                    <button id="client_secret-copy-btn" class="btn btn-outline-secondary clipboard-button" type="button"
+                            data-clipboard-target="#client_secret" data-trigger="manual"
+                            title="Copied!">{% translate "Copy" %}</button>
+                </div>
+            </div>
+        {% endif %}
         <div class="mb-3">
             <label for="client_type" class="form-label">{% translate "Client type" %}</label>
             <input id="client_type" class="form-control" type="text" value="{{ application.client_type }}"

poetry.lock

@@ -40,7 +40,7 @@ django-filter = "^24.0"
 djangorestframework-guardian = "^0.3.0"
 uritemplate = "^4.1.1"
 django-recurrence = "^1.11.1"
-django-oauth-toolkit = "^2.3.0"
+django-oauth-toolkit = "~2.4.0"  # pinned because minor versions sometimes require migrations in our models
 urllib3 = "^1.26.0,<2.0.0"  # pinned because of uberspace issues with urllib3 2.0.0
 pyyaml = "^6.0.1"
 lxml = ">=4.9.3,<6.0.0"