diff --git a/gnuviechadmin/gnuviechadmin/auth.py b/gnuviechadmin/gnuviechadmin/auth.py new file mode 100644 index 0000000..f493471 --- /dev/null +++ b/gnuviechadmin/gnuviechadmin/auth.py @@ -0,0 +1,11 @@ +from allauth.account.adapter import DefaultAccountAdapter + + +class NoNewUsersAccountAdapter(DefaultAccountAdapter): + """ + Adapter to disable allauth new signups + + """ + + def is_open_for_signup(self, request): + return False diff --git a/gnuviechadmin/gnuviechadmin/settings.py b/gnuviechadmin/gnuviechadmin/settings.py index 5e3e890..b1a6d1c 100644 --- a/gnuviechadmin/gnuviechadmin/settings.py +++ b/gnuviechadmin/gnuviechadmin/settings.py @@ -216,7 +216,6 @@ ALLAUTH_APPS = ( "allauth.socialaccount", "allauth.socialaccount.providers.google", "allauth.socialaccount.providers.linkedin_oauth2", - "allauth.socialaccount.providers.twitter", ) # Apps specific for this project go here. @@ -251,9 +250,11 @@ MESSAGE_TAGS = { # ######### ALLAUTH CONFIGURATION +ACCOUNT_ADAPTER = "gnuviechadmin.auth.NoNewUsersAccountAdapter" ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_EMAIL_VERIFICATION = "mandatory" LOGIN_REDIRECT_URL = "/" +SOCIALACCOUNT_AUTO_SIGNUP = False SOCIALACCOUNT_QUERY_EMAIL = True # ######### END ALLAUTH CONFIGURATION diff --git a/gnuviechadmin/templates/account/login.html b/gnuviechadmin/templates/account/login.html index 88862b6..57f9b1c 100644 --- a/gnuviechadmin/templates/account/login.html +++ b/gnuviechadmin/templates/account/login.html @@ -5,32 +5,29 @@ {% block page_title %}{% trans "Sign In" %}{% endblock page_title %} {% block content %} -{% get_providers as socialaccount_providers %} -{% if socialaccount_providers %} -
{% blocktrans with site.name as site_name %}Please sign in with one -of your existing third party accounts. Or, sign up -for a {{site_name}} account and sign in below:{% endblocktrans %}
- -{% trans 'or' %}
-{% else %} -{% blocktrans %}If you have not created an account yet, then please -sign up first.{% endblocktrans %}
-{% endif %} - - + {% get_providers as socialaccount_providers %} +