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

Invitation: move outgoing invitations to invite/outgoing.

Browse Source
This commit is contained in:
Tom Hacohen
2020-05-24 18:19:22 +03:00
parent 118dbea4e3
commit a965a76c36
3 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
django_etesync/serializers.py
View File

@@ -268,29 +268,24 @@ class CollectionInvitationSerializer(serializers.ModelSerializer):
slug_field=User.USERNAME_FIELD,
queryset=User.objects
)
collection = serializers.SerializerMethodField('get_collection')
fromPubkey = serializers.SerializerMethodField('get_from_pubkey')
collection = serializers.CharField(source='collection.uid')
fromPubkey = BinaryBase64Field(source='fromMember.user.userinfo.pubkey', read_only=True)
signedEncryptionKey = BinaryBase64Field()
class Meta:
model = models.CollectionInvitation
fields = ('username', 'uid', 'collection', 'signedEncryptionKey', 'accessLevel', 'fromPubkey', 'version')
def get_collection(self, obj):
return obj.collection.uid
def get_from_pubkey(self, obj):
return b64encode(obj.fromMember.user.userinfo.pubkey)
def validate_user(self, value):
request = self.context['request']
if request.user == value:
if request.user == value.lower():
raise serializers.ValidationError('Inviting yourself is not allowed')
return value
def create(self, validated_data):
collection = self.context['collection']
request = self.context['request']
collection = validated_data.pop('collection')
member = collection.members.get(user=request.user)