mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-15 07:12:16 +00:00
Provides more details and only one user id
This commit is contained in:
@@ -14,14 +14,13 @@ class UserHandler(BaseHandler):
|
|||||||
def read(self, request, id=None):
|
def read(self, request, id=None):
|
||||||
if id:
|
if id:
|
||||||
try:
|
try:
|
||||||
user = User.objects.filter(id=id)
|
u = User.objects.filter(id=id)
|
||||||
except (User.DoesNotExist, ValueError):
|
except (User.DoesNotExist, ValueError):
|
||||||
return rc.NOT_HERE
|
return rc.NOT_HERE
|
||||||
|
|
||||||
if 'user' in request.GET:
|
if 'user' in request.GET:
|
||||||
try:
|
try:
|
||||||
user = User.objects.filter(username=request.GET['user'])
|
u = User.objects.filter(username=request.GET['user'])
|
||||||
print user
|
|
||||||
except User.DoesNotExist:
|
except User.DoesNotExist:
|
||||||
return rc.NOT_HERE
|
return rc.NOT_HERE
|
||||||
|
|
||||||
@@ -30,15 +29,12 @@ class UserHandler(BaseHandler):
|
|||||||
sa = ServiceAccount.objects.filter(service_uid=request.get['serviceuid'])
|
sa = ServiceAccount.objects.filter(service_uid=request.get['serviceuid'])
|
||||||
except ServiceAccount.DoesNotExist:
|
except ServiceAccount.DoesNotExist:
|
||||||
return rc.NOT_HERE
|
return rc.NOT_HERE
|
||||||
user = sa.user
|
u = sa.user
|
||||||
|
|
||||||
|
|
||||||
out = []
|
d = { 'id': u.id, 'username': u.username, 'password': u.password, 'serviceaccounts': u.serviceaccount_set.all(),
|
||||||
for u in user:
|
'eveapi': u.eveaccount_set.all(), 'email': u.email }
|
||||||
d = { 'id': u.id, 'username': u.username, 'password': u.password, 'serviceaccounts': u.serviceaccount_set.all(), 'eveapi': u.eveaccount_set.all() }
|
return d
|
||||||
out.append (d)
|
|
||||||
|
|
||||||
return out
|
|
||||||
|
|
||||||
|
|
||||||
class ServiceLoginHandler(BaseHandler):
|
class ServiceLoginHandler(BaseHandler):
|
||||||
|
|||||||
Reference in New Issue
Block a user