PAOV
/
tea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9

Browse Source
master
paov 4 years ago
parent c1b8b0369d
commit 2675d4670c
4 changed files with 26 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      choose/templates/login.html
  2. 2
      requirements.txt
  3. 27
      tea/settings.py
  4. 2
      tea/urls.py

20
choose/templates/login.html
Unescape View File

@ -5,7 +5,23 @@
<title>Login</title> <title>Login</title>
</head> </head>
<body> <body>
<script async src="https://telegram.org/js/telegram-widget.js?21" data-telegram-login="PAOV_Tea_bot" data-size="large" <script>
data-auth-url="https://tea.paov.ru/auth/complete/telegram" data-request-access="write"></script> function onAuth(user){
window.alert('aaaaa')
const url = new URL('https://tea.paov.ru/auth/complete/telegram')
url.searchParams.append('id',user.id)
url.searchParams.append('first_name',user.first_name)
url.searchParams.append('last_name',user.last_name)
url.searchParams.append('username',user.username)
url.searchParams.append('photo_url',user.photo_url)
url.searchParams.append('auth_date',user.auth_date)
url.searchParams.append('hash',user.hash)
window.location.replace(url.href)
}
</script>
<script async data-telegram-login="PAOV_Tea_bot" data-size="large"
data-onauth="setTimeout(onAuth(user), 2000)" data-request-access="write"
src="https://telegram.org/js/telegram-widget.js?21"></script>
</body> </body>
</html> </html>

2
requirements.txt
Unescape View File

@ -5,7 +5,7 @@ cffi==1.15.1
charset-normalizer==2.1.1 charset-normalizer==2.1.1
cryptography==38.0.1 cryptography==38.0.1
defusedxml==0.7.1 defusedxml==0.7.1
Django==4.1.2 Django==3.2.16
django-cors-headers==3.13.0 django-cors-headers==3.13.0
idna==3.4 idna==3.4
oauthlib==3.2.1 oauthlib==3.2.1

27
tea/settings.py
Unescape View File

@ -1,16 +1,7 @@
""" import os
Django settings for tea project.
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 import environ
from pathlib import Path from django.urls import reverse_lazy
env = environ.Env(DEBUG=(bool, False)) env = environ.Env(DEBUG=(bool, False))
root = environ.Path(__file__) - 2 root = environ.Path(__file__) - 2
@ -20,10 +11,7 @@ environ.Env.read_env()
BASE_DIR = Path(__file__).resolve().parent.parent 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 !!!') SECRET_KEY = env.str('SECRET_KEY', '!!! SET YOUR SECRET_KEY !!!')
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
@ -46,7 +34,6 @@ INSTALLED_APPS = [
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'social_django', 'social_django',
'corsheaders',
'choose' 'choose'
] ]
@ -54,7 +41,6 @@ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'corsheaders.middleware.CorsMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
@ -74,6 +60,8 @@ TEMPLATES = [
'django.template.context_processors.request', 'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages', '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_ROOT = f'{BASE_DIR}/media'
MEDIA_URL = '/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') SOCIAL_AUTH_TELEGRAM_BOT_TOKEN = env.str('SOCIAL_AUTH_TELEGRAM_BOT_TOKEN')
LOGIN_REDIRECT_URL = reverse_lazy('home')
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
'social_core.backends.telegram.TelegramAuth', 'social_core.backends.telegram.TelegramAuth',
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',

2
tea/urls.py
Unescape View File

@ -23,7 +23,7 @@ import choose.views
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('auth/', include('social_django.urls', namespace='social')), 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('confirm-choice', choose.views.confirm_choose),
path('login', choose.views.login_view, name='login_view') path('login', choose.views.login_view, name='login_view')
] ]

Write Preview
Loading…
Cancel
Save