Merge pull request #52 from justinmayer/chore/upgrade-webauthn-1.6.0

.github/workflows/main.yml

@@ -14,27 +14,16 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
         django-version:
-          - "3.2"
-          - "4.1"
           - "4.2"
+          - "5.0"
         exclude:
-          # Django 3.2 is compatible with Python <= 3.10
-          - python-version: "3.11"
-            django-version: "3.2"
-
-          # Django 4.1 is compatible with Python >= 3.8
-          - python-version: "3.7"
-            django-version: "4.1"
-
-          # Django 4.2 is compatible with Python >= 3.8
-          - python-version: "3.7"
-            django-version: "4.2"
+          # Django 5.0 is compatible with Python >= 3.10
+          - python-version: "3.9"
+            django-version: "5.0"
 
     steps:
       - uses: actions/checkout@v3

docs/_templates/page.html

@@ -13,6 +13,12 @@
   <div class="visually-hidden">Hide table of contents sidebar</div>
 </label>
 
+<a class="skip-to-content muted-link" href="#furo-main-content">
+  {%- trans -%}
+  Skip to content
+  {%- endtrans -%}
+</a>
+
 {% if theme_announcement -%}
 <div class="announcement">
   <aside class="announcement-content">
@@ -68,19 +74,11 @@
           <span>{% trans %}Back to top{% endtrans %}</span>
         </a>
         <div class="content-icon-container">
-          {#- Edit this page, on GitHub -#}
-          {%- if READTHEDOCS and conf_py_path and page_source_suffix and github_user != "None" and github_repo != "None" and github_version %}
-          <div class="edit-this-page">
-            <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}/edit/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}" title="{{ _("Edit this page") }}">
-              <svg aria-hidden="true" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-                <path d="M4 20h4l10.5 -10.5a1.5 1.5 0 0 0 -4 -4l-10.5 10.5v4" />
-                <line x1="13.5" y1="6.5" x2="17.5" y2="10.5" />
-              </svg>
-              <span class="visually-hidden">{{ _("Edit this page") }}</span>
-            </a>
-          </div>
-          {% endif %}
+          {% if theme_top_of_page_button == "edit" -%}
+          {%- include "components/edit-this-page.html" with context -%}
+          {%- elif theme_top_of_page_button != None -%}
+          {{ warning("Got an unsupported value for 'top_of_page_button'") }}
+          {%- endif -%}
           {#- Theme toggle -#}
           <div class="theme-toggle-container theme-toggle-content">
             <button class="theme-toggle">
@@ -95,7 +93,7 @@
             <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
           </label>
         </div>
-        <article role="main">
+        <article role="main" id="furo-main-content">
           {% block content %}{{ body }}{% endblock %}
         </article>
       </div>
@@ -110,12 +108,12 @@
                 </div>
                 <div class="title">{{ next.title }}</div>
               </div>
-              <svg><use href="#svg-arrow-right"></use></svg>
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
             </a>
           {%- endif %}
           {% if prev -%}
             <a class="prev-page" href="{{ prev.link }}">
-              <svg><use href="#svg-arrow-right"></use></svg>
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
               <div class="page-info">
                 <div class="context">
                   <span>{{ _("Previous") }}</span>
@@ -153,6 +151,7 @@
             {%- endif %}
           </div>
           <div class="right-details">
+            {% if theme_footer_icons or READTHEDOCS -%}
             <div class="icons">
               {% if theme_footer_icons -%}
               {% for icon_dict in theme_footer_icons -%}
@@ -179,6 +178,7 @@
               {%- endif -%}
               {%- endif %}
             </div>
+            {%- endif %}
           </div>
         </div>
         {% endblock footer %}
@@ -190,7 +190,7 @@
       <div class="toc-sticky toc-scroll">
         <div class="toc-title-container">
           <span class="toc-title">
-            {{ _("Contents") }}
+            {{ _("On this page") }}
           </span>
         </div>
         <div class="toc-tree-container">

docs/requirements.txt

@@ -1,2 +1,2 @@
-furo==2022.04.07
-sphinx==4.5.0
+furo==2024.04.27
+sphinx==6.2.1

kagi/migrations/0002_remove_webauthnkey_ukey.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.1.1 on 2022-09-23 10:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("kagi", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="webauthnkey",
+            name="ukey",
+        ),
+    ]

kagi/models.py

@@ -19,7 +19,6 @@ class WebAuthnKey(models.Model):
 
     key_name = models.CharField(max_length=64)
     public_key = models.TextField(unique=True)
-    ukey = models.TextField(unique=True)
     credential_id = models.TextField(unique=True)
     sign_count = models.IntegerField()
 

kagi/settings.py

@@ -7,7 +7,6 @@
 
 RELYING_PARTY_ID = getattr(settings, "RELYING_PARTY_ID", "localhost")
 RELYING_PARTY_NAME = getattr(settings, "RELYING_PARTY_NAME", "Kagi Test Project")
-WEBAUTHN_ICON_URL = getattr(settings, "WEBAUTHN_ICON_URL", None)
 WEBAUTHN_TRUSTED_CERTIFICATES = getattr(
     settings,
     "WEBAUTHN_TRUSTED_CERTIFICATES",