SDK-765: Remove redundant image_uri_based_on_content_type Image.base64_image

Author: echarrod

yoti_python_sdk/activity_details.py

@@ -26,8 +26,8 @@ def __init__(self, receipt, decrypted_profile=None):
                     )
 
                     if field.name == config.ATTRIBUTE_SELFIE:
-                        self.try_parse_selfie_field(field)
-                        value = field.value
+                        self.base64_selfie_uri = value.base64_content()
+                        value = field.value  # set value to be byte content, for backwards compatibility
 
                     self.user_profile[field.name] = value
 
@@ -60,12 +60,6 @@ def __init__(self, receipt, decrypted_profile=None):
         if timestamp is not None:
             self.timestamp = datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%SZ')
 
-    def try_parse_selfie_field(self, field):
-        self.base64_selfie_uri = attribute_parser.image_uri_based_on_content_type(
-            field.value,
-            field.content_type
-        )
-
     def try_parse_age_verified_field(self, field):
         if field is not None:
             age_verified = attribute_parser.value_based_on_content_type(

yoti_python_sdk/attribute_parser.py

@@ -5,8 +5,6 @@
 import json
 import logging
 
-from cryptography.fernet import base64
-
 from yoti_python_sdk.protobuf.protobuf import Protobuf
 
 
@@ -33,16 +31,6 @@ def value_based_on_content_type(value, content_type=None):
     return value.decode('utf-8')
 
 
-def image_uri_based_on_content_type(value, content_type=None):
-    if content_type == Protobuf.CT_JPEG:
-        data = base64.b64encode(value).decode('utf-8')
-        return 'data:image/jpeg;base64,{0}'.format(data)
-    elif content_type == Protobuf.CT_PNG:
-        data = base64.b64encode(value).decode('utf-8')
-        return 'data:image/png;base64,{0}'.format(data)
-    return value
-
-
 def convert_to_dict(byte_value):
     decoder = json.JSONDecoder(object_pairs_hook=collections.OrderedDict, strict=False)
     value_to_decode = byte_value.decode()

yoti_python_sdk/image.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from yoti_python_sdk import attribute_parser
+from cryptography.fernet import base64
+
 from yoti_python_sdk.protobuf.protobuf import Protobuf
 
 
@@ -32,7 +33,11 @@ def mime_type(self):
             return ""
 
     def base64_content(self):
-        return attribute_parser.image_uri_based_on_content_type(
-            # TODO: move image_uri_based_on_content_type method to this class
-            self.__data,
-            self.__content_type)
+        if self.__content_type == Protobuf.CT_JPEG:
+            data = base64.b64encode(self.__data).decode('utf-8')
+            return 'data:image/jpeg;base64,{0}'.format(data)
+        elif self.__content_type == Protobuf.CT_PNG:
+            data = base64.b64encode(self.__data).decode('utf-8')
+            return 'data:image/png;base64,{0}'.format(data)
+
+        raise TypeError("Content type '{0}' is not a supported image type".format(self.__content_type))

yoti_python_sdk/tests/test_activity_details.py

@@ -88,14 +88,6 @@ def create_structured_postal_address_field(activity_details, json_address_value)
     activity_details.field.content_type = Protobuf.CT_JSON
 
 
-def test_try_parse_selfie_field_valid_selfie():
-    activity_details = ActivityDetails(successful_receipt())
-    create_selfie_field(activity_details)
-
-    ActivityDetails.try_parse_selfie_field(activity_details, activity_details.field)
-    assert activity_details.base64_selfie_uri is not None
-
-
 def test_try_parse_age_verified_both_missing_not_parsed():
     activity_details = ActivityDetails(successful_receipt())
     field = None

yoti_python_sdk/tests/test_attribute_parser.py

@@ -51,13 +51,3 @@ def test_image_value_based_on_content_type(proto, content_type):
     result = attribute_parser.value_based_on_content_type(BYTE_VALUE, content_type)
     assert result.data == BYTE_VALUE
     assert result.content_type == content_type
-
-
-def test_attribute_parser_image_uri_based_on_content_type(proto):
-    value = b'test string'
-
-    result = attribute_parser.image_uri_based_on_content_type(value, proto.CT_JPEG)
-    assert result == 'data:image/jpeg;base64,dGVzdCBzdHJpbmc='
-
-    result = attribute_parser.image_uri_based_on_content_type(value, proto.CT_PNG)
-    assert result == 'data:image/png;base64,dGVzdCBzdHJpbmc='