SDK-1229: Add test loading ExtraData from Protobuf fixture file

Author: emmas-yoti

yoti_python_sdk/issuance_details.py

@@ -1,11 +1,17 @@
 # -*- coding: utf-8 -*-
 
+from yoti_python_sdk.protobuf.protobuf import Protobuf
+
 
 class IssuanceDetails(object):
     def __init__(self, data_entry):
-        self.__token = getattr(data_entry.value, "issuance_token").decode()
-        self.__expiry_date = data_entry.value.issuing_attributes.expiry_date
-        self.__attributes = data_entry.value.issuing_attributes.definitions
+        if isinstance(data_entry.value, bytes):
+            value = Protobuf.thirdparty_attribute(data_entry.value)
+        else:
+            value = data_entry.value
+        self.__token = value.issuance_token.decode()
+        self.__expiry_date = value.issuing_attributes.expiry_date
+        self.__attributes = value.issuing_attributes.definitions
 
     @property
     def token(self):

yoti_python_sdk/protobuf/protobuf.py

@@ -4,6 +4,7 @@
 from cryptography.fernet import base64
 from yoti_python_sdk.protobuf.attribute_public_api import Attribute_pb2, List_pb2
 from yoti_python_sdk.protobuf.common_public_api import EncryptedData_pb2
+from yoti_python_sdk.protobuf.share_public_api import ExtraData_pb2
 from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
 
 class Protobuf(object):
@@ -67,8 +68,12 @@ def multi_value(data):
 
     @staticmethod
     def extra_data(data):
-        decoded_content = base64.b64decode(data)
         extra_data = ExtraData_pb2.ExtraData()
-        attribute.MergeFromString(decoded_content)
+        extra_data.MergeFromString(data)
         return extra_data
 
+    @staticmethod
+    def thirdparty_attribute(data):
+        thirdparty_attribute = ThirdPartyAttribute_pb2.ThirdPartyAttribute()
+        thirdparty_attribute.MergeFromString(data)
+        return thirdparty_attribute

yoti_python_sdk/tests/share/fixtures/testextradata.txt

@@ -0,0 +1 @@
+CmMIBhJfChFzb21lSXNzdWFuY2VUb2tlbhJKChgyMDE5LTEwLTE1VDIyOjA0OjA1LjEyM1oSEwoRY29tLnRoaXJkcGFydHkuaWQSGQoXY29tLnRoaXJkcGFydHkub3RoZXJfaWQ=

yoti_python_sdk/tests/share/test_extra_data.py

@@ -2,8 +2,14 @@
 
 from datetime import datetime
 from types import SimpleNamespace
+import os.path
 
 from yoti_python_sdk.share.extra_data import ExtraData
+from yoti_python_sdk.tests import file_helper
+from yoti_python_sdk.protobuf import protobuf
+
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures")
+EXTRADATA = os.path.join(FIXTURES_DIR, "testextradata.txt")
 
 
 def create_third_party_test_data(token_value, expiry_date, *definitions):
@@ -17,14 +23,20 @@ def create_third_party_test_data(token_value, expiry_date, *definitions):
     return SimpleNamespace(type=ExtraData.THIRD_PARTY_ATTRIBUTE, value=attribute)
 
 
+def get_extra_data_from_base64(filepath):
+    extra_data_bytes = file_helper.get_file_bytes(filepath)
+    protobuf_extra_data = protobuf.Protobuf.extra_data(extra_data_bytes)
+    return ExtraData(protobuf_extra_data.list)
+
+
 def test_attribute_issuance_details_should_return_nil_when_no_data_entries():
     extra_data = ExtraData([])
 
     assert extra_data.attribute_issuance_details is None
 
 
 def test_should_return_first_matching_third_party_attribute():
-    expiry_date = datetime.now()
+    expiry_date = datetime.now().isoformat()
 
     thirdparty_attribute1 = create_third_party_test_data(
         "tokenValue1", expiry_date, "attributeName1"
@@ -41,3 +53,14 @@ def test_should_return_first_matching_third_party_attribute():
         == "attributeName1"
     )
     assert parsed_extra_data.attribute_issuance_details.expiry_date == expiry_date
+
+
+def test_should_parse_multiple_issuing_attributes():
+    extra_data = get_extra_data_from_base64(EXTRADATA)
+    result = extra_data.attribute_issuance_details
+    assert result is not None
+
+    assert result.token == "someIssuanceToken"
+    assert result.expiry_date == "2019-10-15T22:04:05.123Z"
+    assert result.attributes[0].name == "com.thirdparty.id"
+    assert result.attributes[1].name == "com.thirdparty.other_id"