From d018faf171a58e1b2e20d55b16995d7222d80ae2 Mon Sep 17 00:00:00 2001 From: Minigrim0 Date: Thu, 15 Apr 2021 22:00:35 +0200 Subject: [PATCH 1/3] [Add] django oauth --- requirements.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index d2930e40..de52051f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,10 @@ backcall==0.1.0 beautifulsoup4==4.9.1 bleach==3.1.5 certifi==2019.9.11 +cffi==1.14.5 chardet==3.0.4 click==7.1.2 +cryptography==3.4.7 decorator==4.4.1 Django==3.0.14 django-activity-stream==0.9.0 @@ -25,11 +27,12 @@ django-jsonfield==1.4.0 django-jsonfield-compat==0.4.4 django-mptt==0.11.0 django-nyt==1.1.5 +django-oauth-toolkit==1.5.0 django-picklefield==2.0 django-resized==0.3.9 django-sekizai==1.0.0 django-simple-history==2.11.0 -https://github.com/darklow/django-suit/tarball/v2 +django-suit==2.0a1 djangorestframework==3.11.2 entrypoints==0.3 flake8==3.7.8 @@ -44,6 +47,7 @@ ipython==7.9.0 ipython-genutils==0.2.0 isort==4.3.21 jedi==0.15.1 +jwcrypto==0.8 lazy-object-proxy==1.4.3 Markdown==3.2.2 mccabe==0.6.1 @@ -51,6 +55,7 @@ more-itertools==7.2.0 msgpack==0.6.1 mypy-extensions==0.4.3 neovim==0.3.1 +oauthlib==3.1.0 packaging==19.2 parso==0.5.1 pathspec==0.8.0 @@ -59,10 +64,11 @@ pickleshare==0.7.5 Pillow==8.1.1 pluggy==0.13.0 prompt-toolkit==2.0.10 -psycopg2-binary==2.8.6 +psycopg2==2.8.6 ptyprocess==0.6.0 py==1.8.0 pycodestyle==2.5.0 +pycparser==2.20 pyflakes==2.1.1 Pygments==2.7.4 pylint==2.4.4 From 99b009d63d0fa90665b3b51de93f677b2d29f80d Mon Sep 17 00:00:00 2001 From: Minigrim0 Date: Thu, 15 Apr 2021 22:10:34 +0200 Subject: [PATCH 2/3] [Fix] requirements --- requirements.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d2930e40..f894b2a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,10 @@ backcall==0.1.0 beautifulsoup4==4.9.1 bleach==3.1.5 certifi==2019.9.11 +cffi==1.14.5 chardet==3.0.4 click==7.1.2 +cryptography==3.4.7 decorator==4.4.1 Django==3.0.14 django-activity-stream==0.9.0 @@ -25,6 +27,7 @@ django-jsonfield==1.4.0 django-jsonfield-compat==0.4.4 django-mptt==0.11.0 django-nyt==1.1.5 +django-oauth-toolkit==1.5.0 django-picklefield==2.0 django-resized==0.3.9 django-sekizai==1.0.0 @@ -44,6 +47,7 @@ ipython==7.9.0 ipython-genutils==0.2.0 isort==4.3.21 jedi==0.15.1 +jwcrypto==0.8 lazy-object-proxy==1.4.3 Markdown==3.2.2 mccabe==0.6.1 @@ -51,6 +55,7 @@ more-itertools==7.2.0 msgpack==0.6.1 mypy-extensions==0.4.3 neovim==0.3.1 +oauthlib==3.1.0 packaging==19.2 parso==0.5.1 pathspec==0.8.0 @@ -59,10 +64,11 @@ pickleshare==0.7.5 Pillow==8.1.1 pluggy==0.13.0 prompt-toolkit==2.0.10 -psycopg2-binary==2.8.6 +psycopg2==2.8.6 ptyprocess==0.6.0 py==1.8.0 pycodestyle==2.5.0 +pycparser==2.20 pyflakes==2.1.1 Pygments==2.7.4 pylint==2.4.4 From 2a735c4b8d6c1535f78374cf321d94523219f28a Mon Sep 17 00:00:00 2001 From: Minigrim0 Date: Thu, 15 Apr 2021 22:24:33 +0200 Subject: [PATCH 3/3] [Add] oauth app --- incubator/settings.py | 1 + incubator/urls.py | 1 + 2 files changed, 2 insertions(+) diff --git a/incubator/settings.py b/incubator/settings.py index 9ceed4ef..1ae24faf 100644 --- a/incubator/settings.py +++ b/incubator/settings.py @@ -63,6 +63,7 @@ 'constance', 'constance.backends.database', 'simple_history', + 'oauth2_provider', 'incubator', 'events', diff --git a/incubator/urls.py b/incubator/urls.py index 242d5e7e..2c9fe3ca 100644 --- a/incubator/urls.py +++ b/incubator/urls.py @@ -35,6 +35,7 @@ path('api/', include('incubator.apiurls')), path('notifications/', include('django_nyt.urls')), path('r/', redir.views.short_url, name='redirection'), + path('oauth/', include('oauth2_provider.urls', namespace='oauth2_provider')), ] if settings.DEBUG: