Merge pull request #3114 from SMillerDev/feat/api/oauth

feat: add OAuth authentication
This commit is contained in:
Mouse Reeve 2024-04-24 15:45:54 -07:00 committed by GitHub
commit c4b21ee258
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 1 deletions

View file

@ -101,6 +101,7 @@ INSTALLED_APPS = [
"django.contrib.messages", "django.contrib.messages",
"django.contrib.staticfiles", "django.contrib.staticfiles",
"django.contrib.humanize", "django.contrib.humanize",
"oauth2_provider",
"file_resubmit", "file_resubmit",
"sass_processor", "sass_processor",
"bookwyrm", "bookwyrm",

View file

@ -2,7 +2,7 @@
from django.conf.urls.static import static from django.conf.urls.static import static
from django.contrib import admin from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.urls import path, re_path from django.urls import path, re_path, include
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from bookwyrm import settings, views from bookwyrm import settings, views
@ -829,6 +829,7 @@ urlpatterns = [
r"^summary_revoke_key/?$", views.summary_revoke_key, name="summary-revoke-key" r"^summary_revoke_key/?$", views.summary_revoke_key, name="summary-revoke-key"
), ),
path("guided-tour/<tour>", views.toggle_guided_tour), path("guided-tour/<tour>", views.toggle_guided_tour),
re_path(r"^o/", include("oauth2_provider.urls", namespace="oauth2_provider")),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# Serves /static when DEBUG is true. # Serves /static when DEBUG is true.

View file

@ -10,6 +10,7 @@ django-compressor==4.4
django-csp==3.7 django-csp==3.7
django-imagekit==4.1.0 django-imagekit==4.1.0
django-model-utils==4.3.1 django-model-utils==4.3.1
django-oauth-toolkit==2.3.0
django-pgtrigger==4.11.0 django-pgtrigger==4.11.0
django-redis==5.2.0 django-redis==5.2.0
django-sass-processor==1.2.2 django-sass-processor==1.2.2