diff --git a/choose/templates/login.html b/choose/templates/login.html index d21f23a..3458999 100644 --- a/choose/templates/login.html +++ b/choose/templates/login.html @@ -5,7 +5,23 @@ Login - + + + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1136e2a..29ac2ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ cffi==1.15.1 charset-normalizer==2.1.1 cryptography==38.0.1 defusedxml==0.7.1 -Django==4.1.2 +Django==3.2.16 django-cors-headers==3.13.0 idna==3.4 oauthlib==3.2.1 diff --git a/tea/settings.py b/tea/settings.py index de98074..98a94c6 100644 --- a/tea/settings.py +++ b/tea/settings.py @@ -1,16 +1,7 @@ -""" -Django settings for tea project. +import os -Generated by 'django-admin startproject' using Django 4.1.2. - -For more information on this file, see -https://docs.djangoproject.com/en/4.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.1/ref/settings/ -""" import environ -from pathlib import Path +from django.urls import reverse_lazy env = environ.Env(DEBUG=(bool, False)) root = environ.Path(__file__) - 2 @@ -20,10 +11,7 @@ environ.Env.read_env() BASE_DIR = Path(__file__).resolve().parent.parent -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = env.str('SECRET_KEY', '!!! SET YOUR SECRET_KEY !!!') # SECURITY WARNING: don't run with debug turned on in production! @@ -46,7 +34,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'social_django', - 'corsheaders', 'choose' ] @@ -54,7 +41,6 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - 'corsheaders.middleware.CorsMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -74,6 +60,8 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'social_django.context_processors.backends', + 'social_django.context_processors.login_redirect', ], }, }, @@ -136,14 +124,11 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' MEDIA_ROOT = f'{BASE_DIR}/media' MEDIA_URL = '/media/' -CORS_ORIGIN_WHITELIST = [ - 'http://10.15.0.1:8000', - 'http://localhost:8000', - 'http://127.0.0.1:9000', -] SOCIAL_AUTH_TELEGRAM_BOT_TOKEN = env.str('SOCIAL_AUTH_TELEGRAM_BOT_TOKEN') +LOGIN_REDIRECT_URL = reverse_lazy('home') + AUTHENTICATION_BACKENDS = ( 'social_core.backends.telegram.TelegramAuth', 'django.contrib.auth.backends.ModelBackend', diff --git a/tea/urls.py b/tea/urls.py index e47a36e..95a4d86 100644 --- a/tea/urls.py +++ b/tea/urls.py @@ -23,7 +23,7 @@ import choose.views urlpatterns = [ path('admin/', admin.site.urls), path('auth/', include('social_django.urls', namespace='social')), - path('', choose.views.home), + path('', choose.views.home, name='home'), path('confirm-choice', choose.views.confirm_choose), path('login', choose.views.login_view, name='login_view') ]