Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

move to use allauth for login etc

Browse Source
This commit is contained in:
Matthias 2021-08-31 01:12:35 +02:00
parent 28f0e99b84
commit 8afb8ac4d1
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/InvenTree/middleware.py
View File

@ -64,15 +64,15 @@ class AuthRequiredMiddleware(object):
# No authorization was found for the request # No authorization was found for the request
if not authorized: if not authorized:
# A logout request will redirect the user to the login screen # A logout request will redirect the user to the login screen
if request.path_info == reverse_lazy('logout'): if request.path_info == reverse_lazy('account_logout'):
return HttpResponseRedirect(reverse_lazy('login')) return HttpResponseRedirect(reverse_lazy('account_login'))
path = request.path_info path = request.path_info
# List of URL endpoints we *do not* want to redirect to # List of URL endpoints we *do not* want to redirect to
urls = [ urls = [
reverse_lazy('login'), reverse_lazy('account_login'),
reverse_lazy('logout'), reverse_lazy('account_logout'),
reverse_lazy('admin:login'), reverse_lazy('admin:login'),
reverse_lazy('admin:logout'), reverse_lazy('admin:logout'),
] ]
@ -80,7 +80,7 @@ class AuthRequiredMiddleware(object):
if path not in urls and not path.startswith('/api/'): if path not in urls and not path.startswith('/api/'):
# Save the 'next' parameter to pass through to the login view # Save the 'next' parameter to pass through to the login view
return redirect('%s?next=%s' % (reverse_lazy('login'), request.path)) return redirect('%s?next=%s' % (reverse_lazy('account_login'), request.path))
response = self.get_response(request) response = self.get_response(request)

5
InvenTree/InvenTree/urls.py
View File

@ -8,7 +8,6 @@ Passes URL lookup downstream to each app as required.
from django.conf.urls import url, include from django.conf.urls import url, include
from django.urls import path from django.urls import path
from django.contrib import admin from django.contrib import admin
from django.contrib.auth import views as auth_views
from company.urls import company_urls from company.urls import company_urls
from company.urls import manufacturer_part_urls from company.urls import manufacturer_part_urls
@ -142,9 +141,6 @@ urlpatterns = [
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^login/?', auth_views.LoginView.as_view(), name='login'),
url(r'^logout/', auth_views.LogoutView.as_view(template_name='registration/logged_out.html'), name='logout'),
url(r'^settings/', include(settings_urls)), url(r'^settings/', include(settings_urls)),
url(r'^edit-user/', EditUserView.as_view(), name='edit-user'), url(r'^edit-user/', EditUserView.as_view(), name='edit-user'),
@ -153,7 +149,6 @@ urlpatterns = [
url(r'^admin/error_log/', include('error_report.urls')), url(r'^admin/error_log/', include('error_report.urls')),
url(r'^admin/shell/', include('django_admin_shell.urls')), url(r'^admin/shell/', include('django_admin_shell.urls')),
url(r'^admin/', admin.site.urls, name='inventree-admin'), url(r'^admin/', admin.site.urls, name='inventree-admin'),
url(r'accounts/', include('django.contrib.auth.urls')),
url(r'^index/', IndexView.as_view(), name='index'), url(r'^index/', IndexView.as_view(), name='index'),
url(r'^search/', SearchView.as_view(), name='search'), url(r'^search/', SearchView.as_view(), name='search'),

4
InvenTree/templates/navbar.html
View File

@ -86,9 +86,9 @@
{% if user.is_staff %} {% if user.is_staff %}
<li><a href="/admin/"><span class="fas fa-user"></span> {% trans "Admin" %}</a></li> <li><a href="/admin/"><span class="fas fa-user"></span> {% trans "Admin" %}</a></li>
{% endif %} {% endif %}
<li><a href="{% url 'logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li> <li><a href="{% url 'account_logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li>
{% else %} {% else %}
<li><a href="{% url 'login' %}"><span class="fas fa-sign-in-alt"></span> {% trans "Login" %}</a></li> <li><a href="{% url 'account_login' %}"><span class="fas fa-sign-in-alt"></span> {% trans "Login" %}</a></li>
{% endif %} {% endif %}
<hr> <hr>
<li><a href="{% url 'settings' %}"><span class="fas fa-cog"></span> {% trans "Settings" %}</a></li> <li><a href="{% url 'settings' %}"><span class="fas fa-cog"></span> {% trans "Settings" %}</a></li>