1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 16:36:15 +00:00

Fix tokenv2 error when platform_version is empty

This commit is contained in:
zhengxie
2016-01-15 12:27:38 +08:00
parent f9ffaab4be
commit 6d1e5e9884
2 changed files with 22 additions and 2 deletions

View File

@@ -29,8 +29,8 @@ class AuthTokenSerializer(serializers.Serializer):
device_name = serializers.CharField(required=False)
# These fields may be needed in the future
client_version = serializers.CharField(required=False)
platform_version = serializers.CharField(required=False)
client_version = serializers.CharField(required=False, default='')
platform_version = serializers.CharField(required=False, default='')
def validate(self, attrs):
login_id = attrs.get('username')

View File

@@ -1,5 +1,6 @@
import json
from seahub.api2.models import TokenV2
from seahub.profile.models import Profile
from seahub.test_utils import BaseTestCase
from .urls import TOKEN_URL
@@ -52,3 +53,22 @@ class ObtainAuthTokenTest(BaseTestCase):
self.assertEqual(400, resp.status_code)
json_resp = json.loads(resp.content)
assert json_resp['username'] == [u'This field may not be blank.']
def test_can_obtain_token_v2(self):
resp = self.client.post(TOKEN_URL, {
'username': self.p.login_id,
'password': self.user_password,
'platform': 'windows',
'device_id': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
'device_name': 'fake-device-name',
'client_version': '4.1.0',
'platform_version': '',
})
json_resp = json.loads(resp.content)
assert json_resp['token'] is not None
assert len(json_resp['token']) == 40
t = TokenV2.objects.get(key=json_resp['token'])
assert t.client_version == '4.1.0'
assert t.platform_version == ''