caminus/caminus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/success/valid/

Browse Source
This commit is contained in:
Trever Fischer
2012-06-10 21:35:35 -04:00
parent c526bd9541
commit ef23d91248
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/handlers.py
View File

@@ -30,17 +30,17 @@ class NewPlayerSessionHandler(BaseHandler):
try:
profile = MinecraftProfile.objects.all().filter(mc_username__iexact=playername)[0]
except IndexError, e:
return {'success': False, 'error': 'User not found', 'permissions': []}
return {'valid': False, 'error': 'User not found', 'permissions': []}
if profile.user.is_active:
if profile.isBanned():
return {'success': False, 'error': 'Your account is banned.', 'permissions': []}
return {'valid': False, 'error': 'Your account is banned.', 'permissions': []}
ip = request.POST['ip']
server = request.server
profile = MinecraftProfile.objects.get(mc_username__exact=playername)
session = PlayerSession.objects.create(server=server, player=profile, ip=ip)
return {'success': True, 'error': '', 'permissions': profile.serverPermissions(), 'sessionId': session.id}
return {'valid': True, 'error': '', 'permissions': profile.serverPermissions(), 'sessionId': session.id}
else:
return {'success': False, 'error': 'Your account is inactive.', 'permissions': []}
return {'valid': False, 'error': 'Your account is inactive.', 'permissions': []}
class ClosePlayerSessionHandler(BaseHandler):
allowed_methods = ('GET',)
@@ -50,7 +50,7 @@ class ClosePlayerSessionHandler(BaseHandler):
for session in sessions:
session.end = datetime.now()
session.save()
return {'success': True}
return {'valid': True}
class EconomyHandler(BaseHandler):
allowed_methods = ('PUT','GET')

8
api/tests.py
View File

@@ -74,13 +74,13 @@ class SessionTest(unittest.TestCase):
b.delete()
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['success'])
self.assertFalse(session['valid'])
def testBadUserStart(self):
resp = self.client.post('/api/server/session/SomeUnknownUser/new', {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['success'])
self.assertFalse(session['valid'])
def testInactiveStart(self):
self.user.is_active = False
@@ -90,14 +90,14 @@ class SessionTest(unittest.TestCase):
self.user.save()
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['success'])
self.assertFalse(session['valid'])
def testSessionStart(self):
resp = self.client.post('/api/server/session/%s/new'%(self.user.minecraftprofile.mc_username), {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
print repr(session)
self.assertTrue(session['success'])
self.assertTrue(session['valid'])
def testSessionEnd(self):
resp = self.client.post('/api/server/session/%s/new'%(self.user.minecraftprofile.mc_username), {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))