nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 23:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Service ID is now optional on the API

Browse Source
This commit is contained in:
Andrew Williams
2010-06-07 13:21:38 +01:00
parent 67e1c144d8
commit 994bd278d7
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/handlers.py
View File

@@ -45,20 +45,28 @@ class ServiceLoginHandler(BaseHandler):
allowed_methods = ('GET') allowed_methods = ('GET')
def read(self, request): def read(self, request):
if not 'user' in request.GET or not 'pass' in request.GET or not 'service' in request.GET: if not 'user' in request.GET or not 'pass' in request.GET:
return rc.BAD_REQUEST return rc.BAD_REQUEST
userobj = authenticate(username=request.GET['user'], password=request.GET['pass']) userobj = authenticate(username=request.GET['user'], password=request.GET['pass'])
if userobj and userobj.is_active: if userobj and userobj.is_active:
try:
serv = Service.objects.get(id=request.GET['service'])
except:
print 'bad service'
return rc.BAD_REQUEST
srvacct = userobj.serviceaccount_set.filter(service=serv) if 'service' in request.GET:
if len(srvacct): try:
return { 'auth': 'ok', 'id': userobj.id, 'username': userobj.username, serv = Service.objects.get(id=request.GET['service'])
'display-username': srvacct[0].service_uid, 'eveapi': userobj.eveaccount_set.all() } 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' } return { 'auth': 'fail' }