Fix authentication bug in account.views.login

3 files changed, 15 insertions, 3 deletions

diff --git a/account/views.py b/account/views.py
index 9b580c4..8f11d26 100644
--- a/account/views.py
+++ b/account/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render, redirect
 from sbhs_server.tables.models import Account, Board
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.core.validators import validate_email
 from django.contrib import messages
 from sbhs_server.helpers import simple_encrypt
@@ -92,8 +92,17 @@ def confirm(req, token):
 def login(req):
     username = req.POST.get('username')
     password = req.POST.get('password')
-    user = authenticate(username=username, password=password)
-    if user is not None:
+    #user = authenticate(username=username, password=password)
+
+    try:
+        user = Account.objects.get(username=username)
+    except ObjectDoesNotExist:
+        messages.add_message(req, messages.ERROR, "Invalid username or password.")
+        return redirect(index)
+        
+    is_authenticated = user.check_password(password)
+
+    if is_authenticated:
         if user.is_active:
             LOGIN(req, user)
             return redirect(index)
diff --git a/sbhs.sqlite3 b/sbhs.sqlite3
index dfd1b1a..8dbe2dd 100644
--- a/sbhs.sqlite3
+++ b/sbhs.sqlite3
diff --git a/sbhs_server/settings.py b/sbhs_server/settings.py
index 5c0f973..58e2cba 100644
--- a/sbhs_server/settings.py
+++ b/sbhs_server/settings.py
@@ -250,6 +250,9 @@ with open(os.path.join(BASE_DIR, 'map_machine_ids.txt')) as f:
             pass
 
 online_mids = [int(i) for i in boards.keys()]
+
+print "No of machines online : ", len(online_mids)
+
 import sys
 print >>sys.stderr, online_mids[1:33] #srikant
 #srikant