diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py index 9f725ac076..e00adc7d59 100644 --- a/src/backend/InvenTree/InvenTree/settings.py +++ b/src/backend/InvenTree/InvenTree/settings.py @@ -1303,28 +1303,6 @@ MFA_ADAPTER = 'InvenTree.auth_overrides.CustomMFAAdapter' HEADLESS_ADAPTER = 'InvenTree.auth_overrides.CustomHeadlessAdapter' ACCOUNT_LOGOUT_ON_PASSWORD_CHANGE = True - -# region to_be_moved -def get_frontend_url(pui_path: str): - """Generate frontend url. - - #TODO remove this https://codeberg.org/allauth/django-allauth/issues/4226 is merged. - """ - host: str = 'http://localhost:8000' - if not host.endswith('/'): - host += '/' - return f'{host}{FRONTEND_URL_BASE}/{pui_path}' - - -HEADLESS_FRONTEND_URLS = { - 'account_confirm_email': get_frontend_url('verify-email/{key}'), # noqa: RUF027 - 'account_reset_password': get_frontend_url('reset-password'), - 'account_reset_password_from_key': get_frontend_url('set-password?key={key}'), # noqa: RUF027 - 'account_signup': get_frontend_url('register'), - 'socialaccount_login_error': get_frontend_url('social-login-error'), -} -# endregion to_be_moved - HEADLESS_ONLY = True HEADLESS_TOKEN_STRATEGY = 'InvenTree.auth_overrides.DRFTokenStrategy' MFA_ENABLED = get_boolean_setting( diff --git a/src/backend/requirements.in b/src/backend/requirements.in index 81871c7749..3528c028bd 100644 --- a/src/backend/requirements.in +++ b/src/backend/requirements.in @@ -2,7 +2,7 @@ Django<5.0 # Django package coreapi # API documentation for djangorestframework cryptography>=40.0.0,!=40.0.2,<=43.0.3 # Core cryptographic functionality -django-allauth[mfa,socialaccount,saml,openid] # SSO for external providers via OpenID +django-allauth[mfa,socialaccount,saml,openid] @ git+https://codeberg.org/allauth/django-allauth@main # SSO for external providers via OpenID django-cleanup # Automated deletion of old / unused uploaded files django-cors-headers # CORS headers extension for DRF django-dbbackup # Backup / restore of database and media files diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index 2645e137d9..71809d7678 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -412,8 +412,7 @@ django==4.2.18 \ # djangorestframework # djangorestframework-simplejwt # drf-spectacular -django-allauth[mfa, openid, saml, socialaccount]==65.3.1 \ - --hash=sha256:e02e951b71a2753a746459f2efa114c7c72bf2cef6887dbe8607a577c0350587 +django-allauth[mfa, openid, saml, socialaccount] @ git+https://codeberg.org/allauth/django-allauth@b802a0ff6206a8b7b6c9ecf7148d414f6868d47a # via -r src/backend/requirements.in django-cleanup==9.0.0 \ --hash=sha256:19f8b0e830233f9f0f683b17181f414672a0f48afe3ea3cc80ba47ae40ad880c \