From 9781d409d3a890af0594fb74dd8c3de2da9b93af Mon Sep 17 00:00:00 2001 From: Paymir121 Date: Wed, 3 Apr 2024 19:41:31 +0300 Subject: [PATCH 1/3] django allauth vk yandex --- backend/backend/settings.py | 54 ++++++++++++++++++++++++------------- backend/backend/urls.py | 21 ++++++++------- backend/requirements.txt | 1 + 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/backend/backend/settings.py b/backend/backend/settings.py index bdb4701..f03f1d2 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -30,8 +30,12 @@ "api", "users", "documents", - "colorfield", # wtf ? "core", + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.socialaccount.providers.yandex', + 'allauth.socialaccount.providers.vk', ] MIDDLEWARE = [ @@ -44,6 +48,9 @@ "django.middleware.clickjacking.XFrameOptionsMiddleware", "corsheaders.middleware.CorsMiddleware", "django.middleware.common.CommonMiddleware", + # allauth + "django.contrib.sessions.middleware.SessionMiddleware", + "allauth.account.middleware.AccountMiddleware", ] ROOT_URLCONF = "backend.urls" @@ -59,6 +66,7 @@ "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", + 'django.template.context_processors.request', ], }, }, @@ -66,24 +74,24 @@ WSGI_APPLICATION = "backend.wsgi.application" -if os.getenv("BD") == "sqlite": - DATABASES = { - "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", - } - } -else: - DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql", - "NAME": os.getenv("POSTGRES_DB", "django"), - "USER": os.getenv("POSTGRES_USER", "django"), - "PASSWORD": os.getenv("POSTGRES_PASSWORD", ""), - "HOST": os.getenv("DB_HOST", ""), - "PORT": int(os.getenv("DB_PORT", "5432")), - } +# if os.getenv("BD") == "sqlite": +DATABASES = { + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", } +} +# else: +# DATABASES = { +# "default": { +# "ENGINE": "django.db.backends.postgresql", +# "NAME": os.getenv("POSTGRES_DB", "django"), +# "USER": os.getenv("POSTGRES_USER", "django"), +# "PASSWORD": os.getenv("POSTGRES_PASSWORD", ""), +# "HOST": os.getenv("DB_HOST", ""), +# "PORT": int(os.getenv("DB_PORT", "5432")), +# } +# } AUTH_PASSWORD_VALIDATORS = [ @@ -169,5 +177,13 @@ "SECURITY_DEFINITIONS": { "Token": {"type": "apiKey", "name": "Authorization", "in": "header"} }, - "BASE_PATH": "https://documents-template.site/api/", + "BASE_PATH": "https://doki.pro/api/v2/", } + + +AUTHENTICATION_BACKENDS = [ + 'django.contrib.auth.backends.ModelBackend', + 'allauth.account.auth_backends.AuthenticationBackend', +] + +ACCOUNT_LOGIN_REDIRECT_URL = "https://doky.pro/" \ No newline at end of file diff --git a/backend/backend/urls.py b/backend/backend/urls.py index 376fa6a..e0214ff 100644 --- a/backend/backend/urls.py +++ b/backend/backend/urls.py @@ -8,19 +8,20 @@ urlpatterns = [ path('admin/', admin.site.urls), path('api/', include('api.urls')), + path('accounts/', include('allauth.urls')), ] schema_view = get_schema_view( - openapi.Info( - title="Draft API", - default_version='v1', - description="Документация для приложения draft docuemnts проекта Шаблонизатор", - # terms_of_service="URL страницы с пользовательским соглашением", - contact=openapi.Contact(email="nikox122@mail.ru"), - license=openapi.License(name="BSD License"), - ), - public=True, - permission_classes=(permissions.AllowAny,), + openapi.Info( + title="Draft API", + default_version='v1', + description="Документация для приложения draft docuemnts проекта Шаблонизатор", + # terms_of_service="URL страницы с пользовательским соглашением", + contact=openapi.Contact(email="nikox122@mail.ru"), + license=openapi.License(name="BSD License"), + ), + public=True, + permission_classes=(permissions.AllowAny,), ) urlpatterns += [ diff --git a/backend/requirements.txt b/backend/requirements.txt index 43f53b5..1561a1c 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -15,6 +15,7 @@ cryptography==41.0.4 DAWG-Python==0.7.2 defusedxml==0.8.0rc2 Django==3.2 +django-allauth==0.61.1 django-colorfield==0.9.0 django-cors-headers==4.1.0 django-filter==22.1 From 306e4532ba55c8008ff1e8a9a8056af2900b5d0a Mon Sep 17 00:00:00 2001 From: Paymir121 Date: Wed, 3 Apr 2024 19:42:40 +0300 Subject: [PATCH 2/3] django allauth vk yandex --- backend/backend/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/backend/settings.py b/backend/backend/settings.py index f03f1d2..471ec91 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -36,6 +36,7 @@ 'allauth.socialaccount', 'allauth.socialaccount.providers.yandex', 'allauth.socialaccount.providers.vk', + 'allauth.socialaccount.providers.google', ] MIDDLEWARE = [ From 0d9edf48eefdb8d977a7b9029a72ac2e8776ce4a Mon Sep 17 00:00:00 2001 From: Paymir121 Date: Wed, 3 Apr 2024 19:55:21 +0300 Subject: [PATCH 3/3] allauth VK and ayandex --- backend/backend/settings.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/backend/settings.py b/backend/backend/settings.py index 471ec91..a63f165 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -75,24 +75,24 @@ WSGI_APPLICATION = "backend.wsgi.application" -# if os.getenv("BD") == "sqlite": -DATABASES = { - "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", +if os.getenv("BD") == "sqlite": + DATABASES = { + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", + } + } +else: + DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "NAME": os.getenv("POSTGRES_DB", "django"), + "USER": os.getenv("POSTGRES_USER", "django"), + "PASSWORD": os.getenv("POSTGRES_PASSWORD", ""), + "HOST": os.getenv("DB_HOST", ""), + "PORT": int(os.getenv("DB_PORT", "5432")), + } } -} -# else: -# DATABASES = { -# "default": { -# "ENGINE": "django.db.backends.postgresql", -# "NAME": os.getenv("POSTGRES_DB", "django"), -# "USER": os.getenv("POSTGRES_USER", "django"), -# "PASSWORD": os.getenv("POSTGRES_PASSWORD", ""), -# "HOST": os.getenv("DB_HOST", ""), -# "PORT": int(os.getenv("DB_PORT", "5432")), -# } -# } AUTH_PASSWORD_VALIDATORS = [