changes around inactive users, settings key rename

README.rst

@@ -65,12 +65,13 @@ All settings are optional. Defaults are:
     ENROLL_FORBID_USERNAME_DERIVED_PASSWORD = False
 
     ENROLL_AUTH_BACKEND_LOGIN_ATTRIBUTES  = [ username ]  #(use enroll.backends.ModelBackend to have effect)
+    ENROLL_AUTH_BACKEND_INACTIVE_USER = True  #is allowed login authentication by inactive user
 
-    ENROLL_ACCOUNT_VERIFICATION_REQUIRED = True
     ENROLL_VERIFICATION_TOKEN_VALID_DAYS = 14 #unlimited if False
     ENROLL_VERIFICATION_TOKEN_LENGTH = 12
     ENROLL_SEND_VERIFICATION_EMAIL = True
-    ENROLL_LOGIN_AFTER_ACTIVATION = True
+    ENROLL_AUTO_LOGIN = True
+    ENROLL_AUTO_VERIFY = True
 
     LOGIN_REDIRECT_URL #(also used by django auth)
     LOGOUT_REDIRECT_URL

enroll/backends.py

@@ -7,6 +7,8 @@
 class ModelBackend(DjangoModelBackend):
     """Extended authentication backend"""
 
+    supports_inactive_user = getattr(settings, 'ENROLL_AUTH_BACKEND_INACTIVE_USER', True )
+
     #should contains only unique columns !!!
     login_attributes = getattr(settings, 'ENROLL_AUTH_BACKEND_LOGIN_ATTRIBUTES', ['username'] )
 

enroll/forms.py

@@ -65,7 +65,7 @@ class BaseSignUpForm(RequestAcceptingModelForm):
 
     __metaclass__ = ExplicitValidationModelFormMetaclass
 
-    verification_required = getattr(settings , 'ENROLL_ACCOUNT_VERIFICATION_REQUIRED', True)
+    auto_verify_user = getattr(settings , 'ENROLL_AUTO_VERIFY', False)
 
     field_validators = getattr(settings , 'ENROLL_FORM_VALIDATORS', {
         'username': [ UniqueUsernameValidator ],
@@ -91,12 +91,12 @@ def save(self):
 
         user = User.objects.create_user(username, email, password)
 
-        if self.verification_required:
+        if self.auto_verify_user:
+            token = None
+        else:
             user.is_active = False
             user.save()
             token = self.create_verification_token(user)
-        else:
-            token = None
 
         post_registration.send(sender=user.__class__, user=user, request=self.request, token=token)
         return user

enroll/views.py

@@ -51,7 +51,7 @@ def send_failure_message(self):
 class AutoLoginMixin(object):
     """Provides method to log user"""
 
-    login_on_success = getattr(settings, 'ENROLL_LOGIN_AFTER_ACTIVATION', True)
+    login_on_success = getattr(settings, 'ENROLL_AUTO_LOGIN', True)
 
     def login_user(self, user):
         anonymous_session_data = dict(self.request.session.items())
@@ -157,7 +157,7 @@ class VerifyPasswordResetView(AutoLoginMixin, SuccessMessageFormView):
     template_name ='registration/password_reset_confirm.html'
     form_class = PasswordResetStepTwoForm
     success_url = '/'
-    login_on_success = getattr(settings, 'ENROLL_LOGIN_AFTER_ACTIVATION', True)
+    login_on_success = getattr(settings, 'ENROLL_AUTO_LOGIN', True)
 
     def get_form_kwargs(self):
         kwargs = dict(request=self.request, user=self.token.user)