Fixes here and there

README.md

@@ -84,6 +84,14 @@ You will run `migrate` to create/migrate the useraudit DB tables. Ex:
 ```
 $ ./manage.py migrate useraudit
 ```
+Then add useraudit to your project url for the activate link to work in django admin.
+
+```
+...
+url(r'^useraudit/', include('useraudit.urls')),
+...
+```
+
 
 ### Model changes for password expiration
 

useraudit/backend.py

@@ -22,7 +22,7 @@ def user_pre_save(sender, instance=None, raw=False, **kwargs):
     # that the user isn't inactivated on next login by the AuthFailedLoggerBackend
     current_user = sender.objects.get(pk=user.pk)
     if not current_user.is_active and user.is_active:
-        LoginAttemptLogger().reset(user.username)
+        LoginAttemptLogger().reset(user.get_username())
 
 
 class AuthFailedLoggerBackend(object):
@@ -34,7 +34,7 @@ def __init__(self):
 
     def authenticate(self, **credentials):
         UserModel = get_user_model()
-        self.username = credentials.get(get_user_model().USERNAME_FIELD)
+        self.username = credentials.get('username')
         self.login_logger.log_failed_login(self.username, get_request())
         self.login_attempt_logger.increment(self.username)
         self.block_user_if_needed()

useraudit/middleware.py

@@ -1,11 +1,12 @@
 import threading
+from django.utils.deprecation import MiddlewareMixin
 
 thread_data = threading.local()
 
 def get_request():
     return getattr(thread_data, 'request', None)
 
-class RequestToThreadLocalMiddleware(object):
+class RequestToThreadLocalMiddleware(MiddlewareMixin):
 
     def process_request(self, request):
         thread_data.request = request

useraudit/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import datetime
 from django.contrib.auth.signals import user_logged_in
 import datetime
 
@@ -14,14 +15,14 @@ class LoginAttemptLogger(object):
     def reset(self, username):
         defaults = {
             'count': 0,
-            'timestamp': datetime.datetime.now()
+            'timestamp': timezone.now()
         }
         LoginAttempt.objects.update_or_create(username=username, defaults=defaults)
 
     def increment(self, username):
         obj, created = LoginAttempt.objects.get_or_create(username=username)
         obj.count += 1
-        obj.timestamp = datetime.datetime.now()
+        obj.timestamp = timezone.now()
         obj.save()