From e3fea134256a3ac7330c86fb37fe1a89c9be54a9 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Mon, 7 Jun 2010 13:50:39 +0100
Subject: [PATCH] Remove ServiceLogin and updated User

---
 api/handlers.py | 39 +++------------------------------------
 api/urls.py     |  2 --
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/api/handlers.py b/api/handlers.py
index 351b717..6dde68c 100644
--- a/api/handlers.py
+++ b/api/handlers.py
@@ -14,55 +14,22 @@ class UserHandler(BaseHandler):
     def read(self, request, id=None):
         if id:
             try:
-                u = User.objects.filter(id=id)
+                u = User.objects.get(id=id)
             except (User.DoesNotExist, ValueError):
                 return rc.NOT_HERE
 
         if 'user' in request.GET:
             try:
-                u = User.objects.filter(username=request.GET['user'])
+                u = User.objects.get(username=request.GET['user'])
             except User.DoesNotExist:
                 return rc.NOT_HERE
 
         if 'serviceuid' in request.GET:
             try:
-                sa = ServiceAccount.objects.filter(service_uid=request.get['serviceuid'])
+                u = ServiceAccount.objects.get(service_uid=request.get['serviceuid']).user
             except ServiceAccount.DoesNotExist:
                 return rc.NOT_HERE
-            u = sa.user
-
 
         d = { 'id': u.id, 'username': u.username, 'password': u.password, 'serviceaccounts': u.serviceaccount_set.all(), 
                   'eveapi': u.eveaccount_set.all(), 'email': u.email }
         return d
-
-
-class ServiceLoginHandler(BaseHandler):
-    allowed_methods = ('GET')
-
-    def read(self, request):
-        if not 'user' in request.GET or not 'pass' in request.GET:
-            return rc.BAD_REQUEST
-
-        userobj = authenticate(username=request.GET['user'], password=request.GET['pass'])
-        if userobj and userobj.is_active:
-
-            if 'service' in request.GET:
-                try:
-                    serv = Service.objects.get(id=request.GET['service'])
-                except:
-                    return rc.BAD_REQUEST
-
-                srvacct = userobj.serviceaccount_set.filter(service=serv)
-                if len(srvacct):
-                    displayname = srvacct[0].service_uid
-                else:
-                    displayname = userobj.username
-            else:
-                displayname = userobj.username
-
-
-            return { 'auth': 'ok', 'id': userobj.id, 'username': userobj.username, 'email': userobj.email,
-                     'display-username': displayname, 'eveapi': userobj.eveaccount_set.all() }
-
-        return { 'auth': 'fail' }
diff --git a/api/urls.py b/api/urls.py
index fc69748..36d57e8 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -8,11 +8,9 @@ oauth = { 'authentication': OAuthAuthentication() }
 noauth = { 'authentication': NoAuthentication() }
 
 user_resource = Resource(handler=UserHandler, **noauth)
-servicelogin_resource = Resource(handler=ServiceLoginHandler, **noauth)
 
 urlpatterns = patterns('',
     url(r'^user/$', user_resource),
-    url(r'^servicelogin/$', servicelogin_resource),
 )
 
 urlpatterns += patterns('piston.authentication',