From dd32ca337d5957599a5076071bcd9cf0d40b6af2 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Tue, 21 Jan 2025 03:12:02 +0100 Subject: [PATCH] remove dj_rest_auth stuff --- .../InvenTree/auth_override_views.py | 40 ------------------- src/backend/InvenTree/InvenTree/settings.py | 3 -- 2 files changed, 43 deletions(-) delete mode 100644 src/backend/InvenTree/InvenTree/auth_override_views.py diff --git a/src/backend/InvenTree/InvenTree/auth_override_views.py b/src/backend/InvenTree/InvenTree/auth_override_views.py deleted file mode 100644 index 3362c3bf07..0000000000 --- a/src/backend/InvenTree/InvenTree/auth_override_views.py +++ /dev/null @@ -1,40 +0,0 @@ -"""Overrides for registration view.""" - -from django.utils.translation import gettext_lazy as _ - -from allauth.account import app_settings as allauth_account_settings -from dj_rest_auth.app_settings import api_settings -from dj_rest_auth.registration.views import RegisterView - - -class CustomRegisterView(RegisterView): - """Registers a new user. - - Accepts the following POST parameters: username, email, password1, password2. - """ - - # Fixes https://github.com/inventree/InvenTree/issues/8707 - # This contains code from dj-rest-auth 7.0 - therefore the version was pinned - def get_response_data(self, user): - """Override to fix check for auth_model.""" - if ( - allauth_account_settings.EMAIL_VERIFICATION - == allauth_account_settings.EmailVerificationMethod.MANDATORY - ): - return {'detail': _('Verification e-mail sent.')} - - if api_settings.USE_JWT: - data = { - 'user': user, - 'access': self.access_token, - 'refresh': self.refresh_token, - } - return api_settings.JWT_SERIALIZER( - data, context=self.get_serializer_context() - ).data - elif self.token_model: - # Only change in this block is below - return api_settings.TOKEN_SERIALIZER( - user.api_tokens.last(), context=self.get_serializer_context() - ).data - return None diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py index 01393c1052..9f725ac076 100644 --- a/src/backend/InvenTree/InvenTree/settings.py +++ b/src/backend/InvenTree/InvenTree/settings.py @@ -558,9 +558,6 @@ USE_JWT = get_boolean_setting('INVENTREE_USE_JWT', 'use_jwt', False) if USE_JWT: JWT_AUTH_COOKIE = 'inventree-auth' JWT_AUTH_REFRESH_COOKIE = 'inventree-token' - REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append( - 'dj_rest_auth.jwt_auth.JWTCookieAuthentication' - ) INSTALLED_APPS.append('rest_framework_simplejwt') # WSGI default setting