SDK-1229: Add Extra Data processing to get activity details receipt

processing

Author: emmas-yoti

yoti_python_sdk/activity_details.py

@@ -7,16 +7,22 @@
 
 from yoti_python_sdk import attribute_parser, config
 from yoti_python_sdk.profile import Profile, ApplicationProfile
+from yoti_python_sdk.share.extra_data import ExtraData
 
 
 class ActivityDetails:
     def __init__(
-        self, receipt, decrypted_profile=None, decrypted_application_profile=None
+        self,
+        receipt,
+        decrypted_profile=None,
+        decrypted_application_profile=None,
+        decrypted_extra_data=None,
     ):
         self.decrypted_profile = decrypted_profile
         self.user_profile = {}  # will be removed in v3.0.0
         self.base64_selfie_uri = None
         self.decrypted_application_profile = decrypted_application_profile
+        self.extra_data = None
 
         if decrypted_profile and hasattr(decrypted_profile, "attributes"):
             decrypted_profile_attributes = decrypted_profile.attributes
@@ -79,6 +85,9 @@ def __init__(
         if timestamp is not None:
             self.timestamp = datetime.strptime(timestamp, "%Y-%m-%dT%H:%M:%SZ")
 
+        if decrypted_extra_data:
+            self.extra_data = ExtraData(decrypted_extra_data)
+
     @property
     def remember_me_id(self):
         return self.__remember_me_id

yoti_python_sdk/client.py

@@ -67,6 +67,7 @@ def get_activity_details(self, encrypted_request_token):
         proto = protobuf.Protobuf()
         encrypted_data = proto.current_user(receipt)
         encrypted_application_profile = proto.current_application(receipt)
+        encrypted_extra_data = proto.extra_data(receipt)
 
         if not encrypted_data:
             return ActivityDetails(receipt)
@@ -81,6 +82,12 @@ def get_activity_details(self, encrypted_request_token):
             encrypted_application_profile.iv,
             encrypted_application_profile.cipher_text,
         )
+        if encrypted_extra_data:
+            decrypted_extra_data = self.__crypto.decipher(
+                unwrapped_key, encrypted_extra_data.iv, encrypted_extra_data.cipher_text
+            )
+        else:
+            decrypted_extra_data = None
 
         user_profile_attribute_list = proto.attribute_list(decrypted_profile_data)
         application_profile_attribute_list = proto.attribute_list(
@@ -91,6 +98,7 @@ def get_activity_details(self, encrypted_request_token):
             receipt=receipt,
             decrypted_profile=user_profile_attribute_list,
             decrypted_application_profile=application_profile_attribute_list,
+            decrypted_extra_data=decrypted_extra_data,
         )
 
     def perform_aml_check(self, aml_profile):

yoti_python_sdk/protobuf/protobuf.py

@@ -67,9 +67,15 @@ def multi_value(data):
         return multi_value
 
     @staticmethod
-    def extra_data(data):
-        extra_data = ExtraData_pb2.ExtraData()
-        extra_data.MergeFromString(data)
+    def extra_data(receipt):
+        if receipt.get("extra_data_content") is None or receipt.get("extra_data_content") == '':
+            return None
+
+        extra_data_content = receipt["extra_data_content"]
+        extra_data_content = base64.b64decode(extra_data_content)
+
+        extra_data = EncryptedData_pb2.EncryptedData()
+        extra_data.MergeFromString(extra_data_content)
         return extra_data
 
     @staticmethod

yoti_python_sdk/share/extra_data.py

@@ -2,13 +2,16 @@
 
 from yoti_python_sdk.issuance_details import IssuanceDetails
 from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
+from yoti_python_sdk.protobuf.share_public_api import ExtraData_pb2
 
 
 class ExtraData(object):
     THIRD_PARTY_ATTRIBUTE = 6
 
-    def __init__(self, proto):
+    def __init__(self, raw):
         self.__attribute_issuance_details = None
+        proto = ExtraData_pb2.ExtraData()
+        proto.MergeFromString(raw)
         data_entries_list = proto.list
 
         for data_entry in data_entries_list:

yoti_python_sdk/tests/share/test_extra_data.py

@@ -5,7 +5,6 @@
 
 from yoti_python_sdk.share.extra_data import ExtraData
 from yoti_python_sdk.tests import file_helper
-from yoti_python_sdk.protobuf import protobuf
 
 from yoti_python_sdk.protobuf.share_public_api import IssuingAttributes_pb2
 from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
@@ -38,13 +37,13 @@ def create_third_party_test_data(token_value, expiry_date, *definitions):
 def create_extra_data(data_entry_list):
     extra_data = ExtraData_pb2.ExtraData()
     extra_data.list.extend(data_entry_list)
-    return extra_data
+    return extra_data.SerializeToString()
 
 
 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)
+
+    return ExtraData(extra_data_bytes)
 
 
 def test_attribute_issuance_details_should_return_none_when_no_data_entries():