taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing reset password token from the api

remotes/origin/enhancement/email-actions
Jesús Espino 2013-03-27 19:22:23 +01:00
parent b2cb2a065f
commit 7bff4ae6c2
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
greenmine/base/serializers.py
View File

@ -2,8 +2,8 @@ from rest_framework import serializers
class UserLogged(object): class UserLogged(object):
def __init__(self, session_token, username, first_name, last_name, email, last_login, color, description, default_language, default_timezone, token, colorize_tags): def __init__(self, token, username, first_name, last_name, email, last_login, color, description, default_language, default_timezone, colorize_tags):
self.session_token = session_token self.token = token
self.username = username self.username = username
self.first_name = first_name self.first_name = first_name
self.last_name = last_name self.last_name = last_name
@ -13,7 +13,6 @@ class UserLogged(object):
self.description = description self.description = description
self.default_language = default_language self.default_language = default_language
self.default_timezone = default_timezone self.default_timezone = default_timezone
self.token = token
self.colorize_tags = colorize_tags self.colorize_tags = colorize_tags
@ -28,7 +27,6 @@ class LoginSerializer(serializers.Serializer):
description = serializers.CharField() description = serializers.CharField()
default_language = serializers.CharField(max_length=20) default_language = serializers.CharField(max_length=20)
default_timezone = serializers.CharField(max_length=20) default_timezone = serializers.CharField(max_length=20)
token = serializers.CharField(max_length=200)
colorize_tags = serializers.BooleanField() colorize_tags = serializers.BooleanField()
def restore_object(self, attrs, instance=None): def restore_object(self, attrs, instance=None):
@ -47,7 +45,6 @@ class LoginSerializer(serializers.Serializer):
instance.description = attrs.get('description', instance.description) instance.description = attrs.get('description', instance.description)
instance.default_language = attrs.get('default_language', instance.default_language) instance.default_language = attrs.get('default_language', instance.default_language)
instance.default_timezone = attrs.get('default_timezone', instance.default_timezone) instance.default_timezone = attrs.get('default_timezone', instance.default_timezone)
instance.token = attrs.get('token', instance.token)
instance.colorize_tags = attrs.get('colorize_tags', instance.colorize_tags) instance.colorize_tags = attrs.get('colorize_tags', instance.colorize_tags)
return instance return instance
return UserLogged(**attrs) return UserLogged(**attrs)

3
greenmine/base/views.py
View File

@ -47,7 +47,7 @@ class Login(APIView):
login(request, user) login(request, user)
return_data = LoginSerializer(UserLogged(**{ return_data = LoginSerializer(UserLogged(**{
'session_token': request.session.session_key, 'token': request.session.session_key,
'username': request.user.username, 'username': request.user.username,
'first_name': request.user.first_name, 'first_name': request.user.first_name,
'last_name': request.user.last_name, 'last_name': request.user.last_name,
@ -57,7 +57,6 @@ class Login(APIView):
'description': request.user.description, 'description': request.user.description,
'default_language': request.user.default_language, 'default_language': request.user.default_language,
'default_timezone': request.user.default_timezone, 'default_timezone': request.user.default_timezone,
'token': request.user.token,
'colorize_tags': request.user.colorize_tags, 'colorize_tags': request.user.colorize_tags,
})) }))