PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify binary64 field to support binary renderers/parsers

Browse Source 
Fixes 39c1dfc53c30e65bcbff9e0ba0bb07bfc8bfc577
This commit is contained in:
Tom Hacohen 2020-06-29 13:20:23 +03:00
parent 453275eadf
commit fbf5552a62
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django_etebase/serializers.py
View File

@ -58,19 +58,16 @@ def b64decode(data):
class BinaryBase64Field(serializers.Field): class BinaryBase64Field(serializers.Field):
def to_representation(self, value): def to_representation(self, value):
if self.context.get('supports_binary', False):
return value
else:
return b64encode(value) return b64encode(value)
def to_internal_value(self, data): def to_internal_value(self, data):
return b64decode(data) if isinstance(data, bytes):
# This field does nothing to the data. It's useful for raw binary data
class RawField(serializers.Field):
def to_representation(self, value):
return value
def to_internal_value(self, data):
return data return data
else:
return b64decode(data)
class CollectionEncryptionKeyField(BinaryBase64Field): class CollectionEncryptionKeyField(BinaryBase64Field):
@ -422,7 +419,7 @@ class AuthenticationLoginSerializer(serializers.Serializer):
class AuthenticationLoginInnerSerializer(AuthenticationLoginChallengeSerializer): class AuthenticationLoginInnerSerializer(AuthenticationLoginChallengeSerializer):
challenge = RawField() challenge = BinaryBase64Field()
host = serializers.CharField() host = serializers.CharField()
action = serializers.CharField() action = serializers.CharField()