From 5f9a07fa61b4c8907f6ebc34c95cda2edb497c65 Mon Sep 17 00:00:00 2001 From: "J.G. Rubingh" Date: Tue, 30 Nov 2021 15:00:36 +0100 Subject: [PATCH] Update gitignore --- .gitignore | 2 +- VRE/VRE/settings.py | 3 ++- VRE/VRE/views.py | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d7ac0aa..23db62e 100644 --- a/.gitignore +++ b/.gitignore @@ -143,7 +143,7 @@ dmypy.json cython_debug/ VRE/db.sqlite3* -VRE/media/* .idea docker/project.env VRE/surfnet_conext_secrets.ini +media/ diff --git a/VRE/VRE/settings.py b/VRE/VRE/settings.py index c745054..4c4faf4 100644 --- a/VRE/VRE/settings.py +++ b/VRE/VRE/settings.py @@ -250,7 +250,7 @@ LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/' # Email settings for sending out upload invitations. -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +#EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL', default='Do not reply') EMAIL_HOST = config('EMAIL_HOST', default='') EMAIL_HOST_USER = config('EMAIL_HOST_USER', default='') @@ -292,6 +292,7 @@ CORS_ALLOW_HEADERS = config('CORS_ALLOW_HEADERS', default='accept,accept-encodin CORS_EXPOSE_HEADERS = CORS_ALLOW_HEADERS +# Needed in order to make cross-site HTTP requests with authentication CORS_ALLOW_CREDENTIALS = True # Sentry settings diff --git a/VRE/VRE/views.py b/VRE/VRE/views.py index 04df876..311321a 100644 --- a/VRE/VRE/views.py +++ b/VRE/VRE/views.py @@ -1,9 +1,14 @@ from django.http import HttpResponse from django.template import Template from django.template.context import RequestContext +from django.shortcuts import redirect def test_login_page(request): + # TODO: We could make some logic here to return to front-end...? + # if (request.user.is_authenticated): + # return redirect('http://localhost:3000/en/researchStudies') + template_string = '''

Login test

{% if user.is_authenticated %}

Current user: {{ user.email }}

API Status info