Skip to content

Commit f1e626c

Browse files
committed
Remove magic auth
1 parent 421b1e6 commit f1e626c

14 files changed

Lines changed: 4 additions & 124 deletions

File tree

ci.env

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11

22
DATABASE_URL=postgres://postgres:postgres@localhost:5432/docia
33

4-
PROCONNECT_ALLOWED=1
5-
64
DJANGO_SECRET=mysecret
75
DJANGO_DEBUG=true
86
DJANGO_ALLOWED_HOSTS=127.0.0.1,localhost

docia/auth/forms.py

Lines changed: 0 additions & 6 deletions
This file was deleted.

docia/auth/views.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
from django.conf import settings
2-
from django.contrib.auth import get_user_model
3-
4-
from magicauth import views as magicauth_views
51
from mozilla_django_oidc.views import OIDCAuthenticationCallbackView
62

7-
from docia.auth.forms import LoginForm
8-
9-
User = get_user_model()
10-
11-
12-
class LoginView(magicauth_views.LoginView):
13-
template_name = "docia/auth/login.html"
14-
form_class = LoginForm
15-
16-
17-
def logout(request):
18-
return settings.OIDC_RP_LOGOUT_ENDPOINT
19-
203

214
class CustomOIDCAuthenticationCallbackView(OIDCAuthenticationCallbackView):
225
pass

docia/context_processors.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
def settings(request):
55
return {
66
"settings": {
7-
"PROCONNECT_ALLOWED": dj_settings.PROCONNECT_ALLOWED,
87
"TCHAP_SUPPORT_CANAL_URL": dj_settings.TCHAP_SUPPORT_CANAL_URL,
98
"MATOMO_URL": dj_settings.MATOMO_URL,
109
}

docia/settings.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
# External apps
6868
"django_celery_results",
6969
"mozilla_django_oidc",
70-
"magicauth",
7170
"rest_framework",
7271
# Internal apps
7372
"docia",
@@ -170,19 +169,6 @@
170169
OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
171170
LOGIN_REDIRECT_URL = "/"
172171
LOGOUT_REDIRECT_URL = "/"
173-
PROCONNECT_ALLOWED = config.bool("PROCONNECT_ALLOWED", False)
174-
175-
# Magic Auth
176-
MAGICAUTH_DEFAULT_AUTHENTICATION_BACKEND = "django.contrib.auth.backends.ModelBackend"
177-
MAGICAUTH_EMAIL_FIELD = "email"
178-
MAGICAUTH_FROM_EMAIL = DEFAULT_FROM_EMAIL
179-
MAGICAUTH_LOGGED_IN_REDIRECT_URL_NAME = "home"
180-
MAGICAUTH_EMAIL_HTML_TEMPLATE = "docia/magicauth/email.html"
181-
MAGICAUTH_EMAIL_TEXT_TEMPLATE = "docia/magicauth/email.txt"
182-
MAGICAUTH_EMAIL_SENT_VIEW_TEMPLATE = "docia/magicauth/email_sent.html"
183-
MAGICAUTH_LOGIN_VIEW_TEMPLATE = "docia/magicauth/login.html"
184-
MAGICAUTH_ENABLE_2FA = False
185-
MAGICAUTH_EMAIL_SUBJECT = "Votre lien de connexion Dépenses Éclairées"
186172

187173

188174
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")

docia/templates/docia/auth/login.html

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@
1212
{% block content %}
1313
<div>
1414
<h1 class="fr-h1">Connexion</h1>
15-
16-
<form method="post">
17-
{% csrf_token %}
18-
{{ form }}
19-
<div class="fr-input-group fr-my-4w">
20-
<button type="submit" class="fr-btn" title="Valider">
21-
Se connecter
22-
</button>
23-
</div>
24-
</form>
25-
26-
<hr/>
27-
28-
{% if settings.PROCONNECT_ALLOWED %}
29-
<a href="{% url 'oidc_authentication_init' %}{% if request.GET.next %}?next={{ request.GET.next|urlencode }}{% endif %}" class="fr-btn">Pro connect</a>
30-
{% endif %}
15+
<a href="{% url 'oidc_authentication_init' %}{% if request.GET.next %}?next={{ request.GET.next|urlencode }}{% endif %}" class="fr-btn">Pro connect</a>
3116
</div>
3217
{% endblock %}

docia/templates/docia/magicauth/email.html

Lines changed: 0 additions & 20 deletions
This file was deleted.

docia/templates/docia/magicauth/email.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

docia/templates/docia/magicauth/email_sent.html

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)