Merge c6b70f1 into c4ac9b2

.gitignore

@@ -8,3 +8,6 @@ media/
 .cache/
 .tox/
 .coverage
+.idea
+*.iml
+.DS_Store

spongeauth/accounts/middleware.py

@@ -1,5 +1,6 @@
 from django.urls import resolve
 from django.shortcuts import redirect
+from django.conf import settings
 import django.urls.exceptions
 
 
@@ -16,13 +17,13 @@ def __call__(self, request):
 
     @staticmethod
     def must_verify(user):
-        return user.is_authenticated() and not user.email_verified
+        return user.is_authenticated() and not user.email_verified and settings.REQUIRE_EMAIL_CONFIRM
 
     @staticmethod
     def may_pass(url):
         try:
             return getattr(
-                resolve(url).func, 'allow_without_verified_email', False)
+                resolve(url).func, 'allow_without_verified_email', False) or not settings.REQUIRE_EMAIL_CONFIRM
         except django.urls.exceptions.Resolver404:
             return False
 

spongeauth/accounts/views.py

@@ -199,7 +199,8 @@ def register(request):
             # _log_user_in must happen before sending the email, since the token
             # will change after the user has been logged in.
             resp = _log_user_in(request, user)
-            _send_verify_email(request, user)
+            if django_settings.REQUIRE_EMAIL_CONFIRM:
+                _send_verify_email(request, user)
             return resp
 
     return render(request, 'accounts/register.html', {'form': form})
@@ -251,7 +252,7 @@ def register_google(request):
 
     if user:
         resp = _log_user_in(request, user, skip_twofa=True)
-        if not user.email_verified:
+        if not user.email_verified and django_settings.REQUIRE_EMAIL_CONFIRM:
             # This must happen /after/ _log_user_in.
             _send_verify_email(request, user)
         return resp

spongeauth/spongeauth/settings/base.py

@@ -29,6 +29,8 @@
     'auth.spongepowered.org',
 ]
 
+REQUIRE_EMAIL_CONFIRM = True
+
 
 # Application definition
 

spongeauth/spongeauth/settings/dev.py

@@ -5,6 +5,7 @@
 DEBUG = True
 ALLOWED_HOSTS += ['localhost', '127.0.0.1', '::1']
 INTERNAL_IPS = ['127.0.0.1', '::1']
+REQUIRE_EMAIL_CONFIRM = False
 
 MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',

spongeauth/spongeauth/settings/prod.py

@@ -11,6 +11,8 @@
 
 SECRET_KEY = os.environ['SECRET_KEY']
 
+REQUIRE_EMAIL_CONFIRM = True
+
 DEFAULT_FROM_EMAIL = 'admin@spongepowered.org'
 SERVER_EMAIL = 'admin@spongepowered.org'