Skip to content
Snippets Groups Projects
Commit 50612a44 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Do not override account adapter for invitations

parent ac98ad38
No related branches found
No related tags found
1 merge request!986Resolve "Account adapter overwritten for invitations"
......@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* ACCOUNT_ADAPTER was overriden by invitations
Added
~~~~~
......
......@@ -367,8 +367,6 @@ ACCOUNT_USERNAME_VALIDATORS = "aleksis.core.util.auth_helpers.custom_username_va
# Configuration for django-invitations
# Use custom account adapter
ACCOUNT_ADAPTER = "invitations.models.InvitationsAdapter"
# Expire invitations are configured amout of days
INVITATIONS_INVITATION_EXPIRY = _settings.get("auth.invitation.expiry", 3)
# Use email prefix configured for django-allauth
......
......@@ -7,8 +7,8 @@ from django.contrib.auth.validators import ASCIIUsernameValidator
from django.core.validators import RegexValidator
from django.http import HttpRequest
from allauth.account.adapter import DefaultAccountAdapter
from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
from invitations.models import InvitationsAdapter
from oauth2_provider.models import AbstractApplication
from oauth2_provider.oauth2_validators import OAuth2Validator
from oauth2_provider.scopes import BaseScopes
......@@ -37,7 +37,7 @@ class OurSocialAccountAdapter(DefaultSocialAccountAdapter):
return super().validate_disconnect(account, accounts)
class OurAccountAdapter(DefaultAccountAdapter):
class OurAccountAdapter(InvitationsAdapter):
"""Customised adapter to allow to disable signup."""
def is_open_for_signup(self, request):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment