Merge 77832cbec7 into c4b21ee258

The problem that boto3 closes files has been worked around in django-storages.

bookwyrm/settings.py

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

bookwyrm/urls.py

@@ -2,7 +2,7 @@
 from django.conf.urls.static import static
 from django.contrib import admin
 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 bookwyrm import settings, views
@@ -829,6 +829,7 @@ urlpatterns = [
         r"^summary_revoke_key/?$", views.summary_revoke_key, name="summary-revoke-key"
     ),
     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)
 
 # Serves /static when DEBUG is true.

requirements.txt

@@ -10,6 +10,7 @@ django-compressor==4.4
 django-csp==3.8
 django-imagekit==5.0.0
 django-model-utils==4.4.0
+django-oauth-toolkit==2.3.0
 django-pgtrigger==4.11.0
 django-sass-processor==1.4
 django-storages==1.14.2